diff options
| author | Danny Hermes <daniel.j.hermes@gmail.com> | 2015-08-13 16:12:26 -0700 |
|---|---|---|
| committer | Danny Hermes <daniel.j.hermes@gmail.com> | 2015-08-13 16:12:26 -0700 |
| commit | 405316508ddc9bc20a11b9b67d3e24bfb46c25d7 (patch) | |
| tree | e3db7eb4927e4187cceb2ffa707ab11bffb5dea6 /tox.ini | |
| parent | b4141c9e833c3343d83c84963f9de9efedf0332a (diff) | |
| download | oauth2client-405316508ddc9bc20a11b9b67d3e24bfb46c25d7.tar.gz | |
Removing import OpenSSL hack.
No longer needed since the cryptography 1.0 release has fixed
the slow import (due to changes in the way cffi was used).
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 28 |
1 files changed, 9 insertions, 19 deletions
@@ -4,13 +4,14 @@ envlist = py26,py27,py33,py34,pypy,cover [testenv] basedeps = keyring mock==1.0.1 - pycrypto==2.6 + pycrypto>=2.6 + cryptography>=1.0 + pyopenssl>=0.14 webtest nose flask deps = {[testenv]basedeps} django - pyopenssl==0.14 setenv = PYTHONPATH=../google_appengine commands = nosetests --ignore-files=test_appengine\.py {posargs} @@ -47,19 +48,6 @@ commands = {toxinidir}/scripts/build-docs basepython = python2.6 deps = {[testenv]basedeps} django>=1.5,<1.6 - pyopenssl==0.14 - -[testenv:py26openssl13] -basepython = python2.6 -deps = {[testenv]basedeps} - django>=1.5,<1.6 - pyopenssl<0.14 - -[testenv:py27openssl13] -basepython = python2.7 -deps = {[testenv]basedeps} - django>=1.5,<1.6 - pyopenssl<0.14 [testenv:system-tests] basepython = @@ -67,8 +55,9 @@ basepython = commands = {toxinidir}/scripts/run_system_tests.sh deps = - pycrypto==2.6 - pyopenssl==0.14 + pycrypto>=2.6 + cryptography>=1.0 + pyopenssl>=0.14 passenv = GOOGLE_* OAUTH2CLIENT_* TRAVIS* [testenv:system-tests3] @@ -77,6 +66,7 @@ basepython = commands = {toxinidir}/scripts/run_system_tests.sh deps = - pycrypto==2.6 - pyopenssl==0.14 + pycrypto>=2.6 + cryptography>=1.0 + pyopenssl>=0.14 passenv = {[testenv:system-tests]passenv} |