summaryrefslogtreecommitdiff
path: root/tox.ini
diff options
context:
space:
mode:
authorHynek Schlawack <hs@ox.cx>2016-07-31 14:36:59 +0200
committerAlex Gaynor <alex.gaynor@gmail.com>2016-07-31 08:36:59 -0400
commit17f47bba12d276a1a60829a2300cf9bf302e5882 (patch)
tree8ef0b516e72b31652ca096929cc27bfe0ec0e4d1 /tox.ini
parent8a2dd77c1552b57c212859b1fe81079d5df1d4b4 (diff)
downloadpyopenssl-17f47bba12d276a1a60829a2300cf9bf302e5882.tar.gz
coverage 4.2 doesn't need the clean step anymore (#508)
* coverage 4.2 doesn't need the clean step anymore * Set version for report too
Diffstat (limited to 'tox.ini')
-rw-r--r--tox.ini11
1 files changed, 3 insertions, 8 deletions
diff --git a/tox.ini b/tox.ini
index 92e963d..661e5ca 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,12 +1,12 @@
[tox]
-envlist = coverage-clean,{pypy,py26,py27,py33,py34,py35}{,-cryptographyMaster,-cryptographyMinimum},py27-twistedMaster,pypi-readme,check-manifest,flake8,docs,coverage-report
+envlist = {pypy,py26,py27,py33,py34,py35}{,-cryptographyMaster,-cryptographyMinimum},py27-twistedMaster,pypi-readme,check-manifest,flake8,docs,coverage-report
[testenv]
whitelist_externals =
openssl
passenv = ARCHFLAGS CFLAGS LC_ALL LDFLAGS PATH LD_LIBRARY_PATH TERM
deps =
- coverage
+ coverage>=4.2
pytest>=2.8.5
cryptographyMaster: git+https://github.com/pyca/cryptography.git
cryptographyMinimum: cryptography<1.4
@@ -73,13 +73,8 @@ basepython = python2.7
commands =
sphinx-build -W -b html doc doc/_build/html
-[testenv:coverage-clean]
-deps = coverage
-skip_install = true
-commands = coverage erase
-
[testenv:coverage-report]
-deps = coverage
+deps = coverage>=4.2
skip_install = true
commands =
coverage combine