summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Abramowitz <marc@marc-abramowitz.com>2016-03-08 13:54:54 -0800
committerMarc Abramowitz <marc@marc-abramowitz.com>2016-03-08 13:54:54 -0800
commita58a666b17d1acaa4aee157e4fc0564893be0b6c (patch)
treed225948e71b23978cdb2392becc0a7811d15c21c
parentfb1269dfa01ef1799c0752eaa3337200299e1309 (diff)
downloadpastedeploy-a58a666b17d1acaa4aee157e4fc0564893be0b6c.tar.gz
Eliminate cover and cover3 tox targets
Just measure coverage for all tox test targets
-rw-r--r--pytest.ini1
-rw-r--r--tox.ini21
2 files changed, 3 insertions, 19 deletions
diff --git a/pytest.ini b/pytest.ini
index 5ee6477..69d62a0 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,2 +1,3 @@
[pytest]
+addopts = --cov=paste/deploy --cov-report=xml --cov-report=html --cov-report=term-missing
testpaths = tests
diff --git a/tox.ini b/tox.ini
index 633d7e5..18af92a 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,28 +1,11 @@
[tox]
-envlist = py26, py27, py33, py34, py35, pypy, cover, cover3
+envlist = py26, py27, py33, py34, py35, pypy
[testenv]
deps =
# Paste works on Python 3 since Paste 2.0
Paste
pytest
-commands =
- py.test {posargs}
-
-[testenv:cover]
-basepython = python2.7
-usedevelop = True
-deps =
- {[testenv]deps}
pytest-cov
commands =
- py.test --cov=paste/deploy --cov-report=xml --cov-report=html --cov-report=term-missing {posargs}
-
-[testenv:cover3]
-basepython = python3.5
-usedevelop = True
-deps =
- {[testenv]deps}
- pytest-cov
-commands =
- py.test --cov=paste/deploy --cov-report=xml --cov-report=html --cov-report=term-missing {posargs}
+ py.test {posargs}