diff options
| author | Craig Citro <craigcitro@gmail.com> | 2015-01-05 23:35:18 -0800 |
|---|---|---|
| committer | Craig Citro <craigcitro@gmail.com> | 2015-01-05 23:35:18 -0800 |
| commit | 70c6c2bd517b6d79f2fd3e6fb2eaf08f234da71d (patch) | |
| tree | e23f31e6febc3e902c6a5b2d30afb0275f1343cf /tox.ini | |
| parent | 962cf74715ccd4cc9448eff2276bf490519a85cf (diff) | |
| download | oauth2client-70c6c2bd517b6d79f2fd3e6fb2eaf08f234da71d.tar.gz | |
Update tox.ini for py26+django.
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 14 |
1 files changed, 11 insertions, 3 deletions
@@ -5,10 +5,10 @@ envlist = py26,py27,py33,py34,pypy,cover basedeps = keyring mock pycrypto==2.6 - django webtest nose deps = {[testenv]basedeps} + django pyopenssl==0.14 setenv = PYTHONPATH=../google_appengine commands = nosetests --ignore-files=test_appengine\.py {posargs} @@ -48,12 +48,20 @@ deps = sphinx-rtd-theme commands = ./doc-build +[testenv:py26] +basepython = python2.6 +deps = {[testenv]basedeps} + django>=1.5,<1.6 + pyopenssl==0.14 + [testenv:py26openssl13] basepython = python2.6 deps = {[testenv]basedeps} - pyopenssl<0.14 + django>=1.5,<1.6 + pyopenssl<0.14 [testenv:py27openssl13] basepython = python2.7 deps = {[testenv]basedeps} - pyopenssl<0.14 + django>=1.5,<1.6 + pyopenssl<0.14 |