diff options
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 112 |
1 files changed, 25 insertions, 87 deletions
@@ -1,5 +1,5 @@ [tox] -envlist = py26,py27,py33,py34,py35,pypy,gae,cover +envlist = flake8,py27,py34,py35,gae,cover [testenv] basedeps = mock>=1.3.0 @@ -7,98 +7,43 @@ basedeps = mock>=1.3.0 cryptography>=1.0 pyopenssl>=0.14 webtest - nose + pytest flask - unittest2 sqlalchemy fasteners deps = {[testenv]basedeps} django keyring + jsonpickle setenv = pypy: with_gmp=no DJANGO_SETTINGS_MODULE=tests.contrib.django_util.settings -commands = nosetests --ignore-files=test_appengine\.py --ignore-files=test__appengine_ndb\.py {posargs} +commands = + py.test {posargs} [coverbase] basepython = python2.7 commands = - nosetests \ - --with-coverage \ - --cover-package=oauth2client \ - --cover-package=tests \ - --cover-erase \ - --cover-tests \ - --cover-branches \ - --ignore-files=test_appengine\.py \ - --ignore-files=test__appengine_ndb\.py - nosetests \ - --with-coverage \ - --cover-package=oauth2client.contrib.appengine \ - --cover-package=oauth2client.contrib._appengine_ndb \ - --cover-package=tests.contrib.test_appengine \ - --cover-package=tests.contrib.test__appengine_ndb \ - --with-gae \ - --cover-tests \ - --cover-branches \ - --gae-application=tests/data \ - --gae-lib-root={env:GAE_PYTHONPATH:google_appengine} \ - --logging-level=INFO \ - tests/contrib/test_appengine.py \ - tests/contrib/test__appengine_ndb.py + py.test \ + --cov=oauth2client \ + --cov=tests + py.test \ + --cov=oauth2client \ + --cov=tests \ + --cov-append \ + --gae-sdk={env:GAE_PYTHONPATH:} \ + tests/contrib/appengine deps = {[testenv]deps} coverage - nosegae - -[testenv:py26] -basepython = - python2.6 -commands = - nosetests \ - --ignore-files=test_appengine\.py \ - --ignore-files=test__appengine_ndb\.py \ - --ignore-files=test_keyring_storage\.py \ - --exclude-dir=oauth2client/contrib/django_util \ - --exclude-dir=tests/contrib/django_util \ - {posargs} -deps = {[testenv]basedeps} - nose-exclude - -[testenv:py33] -basepython = - python3.3 -commands = - nosetests \ - --ignore-files=test_appengine\.py \ - --ignore-files=test__appengine_ndb\.py \ - --ignore-files=test_django_orm\.py \ - --ignore-files=test_django_settings\.py \ - --ignore-files=test_django_util\.py \ - --exclude-dir=oauth2client/contrib/django_util \ - --exclude-dir=tests/contrib/django_util \ - {posargs} -deps = {[testenv]basedeps} - keyring - nose-exclude + pytest-cov [testenv:cover] basepython = {[coverbase]basepython} commands = {[coverbase]commands} - coverage report --show-missing --cover-min-percentage=100 -deps = - {[coverbase]deps} - -[testenv:coveralls] -basepython = {[coverbase]basepython} -commands = - {[coverbase]commands} - coverage report --show-missing - coveralls + coverage report --show-missing --fail-under=100 deps = {[coverbase]deps} - coveralls -passenv = {[testenv:system-tests]passenv} [testenv:docs] basepython = python2.7 @@ -114,15 +59,8 @@ commands = {toxinidir}/scripts/build_docs.sh [testenv:gae] basepython = python2.7 deps = {[testenv]basedeps} - nosegae commands = - nosetests \ - --with-gae \ - --gae-lib-root={env:GAE_PYTHONPATH:google_appengine} \ - --gae-application=tests/data \ - --logging-level=INFO \ - tests/contrib/test_appengine.py \ - tests/contrib/test__appengine_ndb.py + py.test --gae-sdk={env:GAE_PYTHONPATH:} tests/contrib/appengine [testenv:system-tests] basepython = @@ -133,7 +71,7 @@ deps = pycrypto>=2.6 cryptography>=1.0 pyopenssl>=0.14 -passenv = GOOGLE_* OAUTH2CLIENT_* TRAVIS* +passenv = GOOGLE_* OAUTH2CLIENT_* TRAVIS* encrypted_* [testenv:system-tests3] basepython = @@ -153,7 +91,6 @@ commands = python {toxinidir}/scripts/run_gce_system_tests.py deps = pycrypto>=2.6 - unittest2 passenv = {[testenv:system-tests]passenv} [testenv:flake8] @@ -163,16 +100,17 @@ deps = flake8-import-order [flake8] -exclude = .tox,.git,./*.egg,build, -application-import-names = oauth2client +exclude = .tox,.git,./*.egg,build,.cache,env,__pycache__ +application-import-names = oauth2client, tests putty-ignore = # E402 module level import not at top of file - # These files have needed configurations defined before import + # This file has needed configurations defined before import docs/conf.py : E402 - tests/contrib/test_appengine.py : E402 - # Additionally, ignore E100 (imports in wrong order) for Django configuration - tests/contrib/test_django_orm.py : E402,I100 # E501 line too long # Ignore lines over 80 chars that include "http:" or "https:" /http:/ : E501 /https:/ : E501 + # E722 do not use bare except + # Existing sloppy usages. + oauth2client/crypt.py : E722 + oauth2client/contrib/multiprocess_file_storage.py : E722 |