From 3c1930d37255bfdeee4550bafd4c55813a44eb14 Mon Sep 17 00:00:00 2001
From: Nicolas Dandrimont <nicolas@dandrimont.eu>
Date: Thu, 21 Nov 2019 11:54:38 +0100
Subject: [PATCH] Merge tox environment configuration
---
tox.ini | 19 +++++++------------
1 file changed, 7 insertions(+), 12 deletions(-)
diff --git a/tox.ini b/tox.ini
index 6289212f..e5023b21 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,26 +1,21 @@
[tox]
envlist=flake8,mypy,py3
-[testenv:py3]
+[testenv]
deps =
# the dependency below is needed for now as a workaround for
# https://github.com/pypa/pip/issues/6239
swh.core[http] >= 0.0.75
.[testing]
+ dev: ipdb
pytest-cov
pifpaf
commands =
- pifpaf run postgresql -- pytest --cov {envsitepackagesdir}/swh/deposit --cov-branch \
- {envsitepackagesdir}/swh/deposit \
- {posargs}
-
-[testenv:py3-dev]
-deps =
- swh.core[http] >= 0.0.75
- .[testing]
- ipdb
-commands =
- pytest {envsitepackagesdir}/swh/deposit/ {posargs}
+ pifpaf run postgresql -- \
+ pytest \
+ !dev: --cov {envsitepackagesdir}/swh/deposit --cov-branch \
+ {envsitepackagesdir}/swh/deposit \
+ {posargs}
[testenv:flake8]
skip_install = true
--
GitLab