aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml3
-rw-r--r--tox.ini14
2 files changed, 15 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index d674f8d..2ac7920 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -9,7 +9,8 @@ env:
- TOX_ENV=py32openssl14
- TOX_ENV=py33openssl13
- TOX_ENV=py33openssl14
- - TOX_ENV=pypy
+ - TOX_ENV=pypyopenssl13
+ - TOX_ENV=pypyopenssl14
install:
- pip install tox
- pip install .
diff --git a/tox.ini b/tox.ini
index 9f3dbf4..52662b5 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,10 @@
[tox]
#envlist = py26, py27, py32, py33
-envlist = py26openssl13, py26openssl14, py27openssl13, py27openssl14, py32openssl13, py32openssl14, py33openssl13, py33openssl14
+envlist = py26openssl13, py26openssl14,
+ py27openssl13, py27openssl14,
+ py32openssl13, py32openssl14,
+ py33openssl13, py33openssl14,
+ pypyopenssl13, pypyopenssl14
[testenv]
deps = keyring
@@ -57,3 +61,11 @@ deps = {[testenv]deps}
basepython = python3.3
deps = {[testenv]deps}
pyopenssl==0.14
+
+[testenv:pypyopenssl13]
+deps = {[testenv]deps}
+ pyopenssl<0.14
+
+[testenv:pypyopenssl14]
+deps = {[testenv]deps}
+ pyopenssl==0.14