summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSybren A. St?vel <sybren@stuvel.eu>2016-01-13 10:04:42 +0100
committerSybren A. St?vel <sybren@stuvel.eu>2016-01-13 10:04:42 +0100
commit3e981a41624a5a71124abb6cfbe61c577a91b775 (patch)
treeb27dee81715248f24e229ffcae1a292d373059fa
parentc9fdbfce486e21e1fcf81560e7a52219e5b4f39e (diff)
downloadrsa-3e981a41624a5a71124abb6cfbe61c577a91b775.tar.gz
Simplified Tox configuration and dropped Python 3.2 support.
The coverage package uses a u'' prefix, which was reintroduced in 3.3.
-rw-r--r--tox.ini41
1 files changed, 5 insertions, 36 deletions
diff --git a/tox.ini b/tox.ini
index 70a8eba..da0e3c6 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,21 +1,14 @@
[tox]
-envlist = py26,py27,py32,py33,pypy
+envlist = py26,py27,py33,py34,py35,pypy
[pytest]
-addopts = -n4 -v --cov rsa --cov-report term-missing # --doctest-modules
+addopts = -v --cov rsa --cov-report term-missing
+# --doctest-modules
[testenv]
+setenv =
+ PYTHONPATH = {toxinidir}:{toxinidir}/tests
commands=py.test []
-
-[testenv:py26]
-deps=pyasn1 >=0.1.3
- coverage >=3.5
- unittest2
- PyTest
- pytest-xdist
- pytest-cov
-
-[testenv:py27]
deps=pyasn1 >=0.1.3
coverage >=3.5
unittest2
@@ -23,27 +16,3 @@ deps=pyasn1 >=0.1.3
pytest-xdist
pytest-cov
-[testenv:py32]
-deps=pyasn1 >=0.1.3
- coverage >= 3.5
- unittest2py3k
- PyTest
- pytest-xdist
- pytest-cov
-
-[testenv:py33]
-deps=pyasn1 >=0.1.3
- coverage >= 3.5
- unittest2py3k
- PyTest
- pytest-xdist
- pytest-cov
-
-[testenv:pypy]
-deps=pyasn1 >=0.1.3
- coverage >= 3.5
- unittest2
- PyTest
- pytest-xdist
- pytest-cov
-