diff --git a/setup.cfg b/setup.cfg index ddcdf9e..d580304 100644 --- a/setup.cfg +++ b/setup.cfg @@ -17,7 +17,7 @@ classifier = Operating System :: OS Independent Programming Language :: Python Programming Language :: Python :: 2.7 - Programming Language :: Python :: 3.4 + Programming Language :: Python :: 3.5 Programming Language :: Python :: Implementation :: CPython Programming Language :: Python :: Implementation :: PyPy License :: OSI Approved :: MIT License diff --git a/tox.ini b/tox.ini index bd10fa7..4575b7d 100644 --- a/tox.ini +++ b/tox.ini @@ -43,6 +43,7 @@ commands = {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsmeext/cornice.py [testenv:pecan-dev-base] +basepython = python3 deps = {[common]testtools} transaction @@ -62,7 +63,7 @@ commands = {envbindir}/nosetests tests/pecantest --with-xunit --xunit-file nosetests-{envname}.xml --verbose {posargs} [testenv:coverage] -basepython = python +basepython = python3 deps = coverage < 3.99 setenv = @@ -74,6 +75,7 @@ commands = {envbindir}/coverage report --show-missing wsme/*.py wsme/protocols/*.py wsmeext/*.py [testenv:doc] +basepython = python3 deps = cloud_sptheme Sphinx < 1.2.99 @@ -88,6 +90,7 @@ deps = flake8 commands = flake8 wsme wsmeext setup.py [testenv:venv] +basepython = python3 commands = {posargs} usedevelop = True deps = @@ -668,6 +671,7 @@ deps = basepython = python3.5 [testenv:pypy-sa5-lxml-json] +basepython = python3 commands = {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.py --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py @@ -680,6 +684,7 @@ deps = lxml [testenv:pypy-sa5] +basepython = python3 commands = {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.py --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py @@ -692,6 +697,7 @@ deps = lxml [testenv:pypy-sa5-lxml-simplejson] +basepython = python3 commands = {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.py --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py @@ -705,6 +711,7 @@ deps = simplejson [testenv:pypy-sa5-simplejson] +basepython = python3 commands = {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.py --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py @@ -718,6 +725,7 @@ deps = simplejson [testenv:pypy-sa5-nolxml-json] +basepython = python3 commands = {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.py --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py @@ -729,6 +737,7 @@ deps = SQLAlchemy<=0.5.99 [testenv:pypy-sa5-nolxml] +basepython = python3 commands = {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.py --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py @@ -740,6 +749,7 @@ deps = SQLAlchemy<=0.5.99 [testenv:pypy-sa5-nolxml-simplejson] +basepython = python3 commands = {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.py --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py @@ -752,6 +762,7 @@ deps = simplejson [testenv:pypy-sa6-lxml-json] +basepython = python3 commands = {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.py --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py @@ -764,6 +775,7 @@ deps = lxml [testenv:pypy-sa6] +basepython = python3 commands = {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.py --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py @@ -776,6 +788,7 @@ deps = lxml [testenv:pypy-sa6-lxml-simplejson] +basepython = python3 commands = {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.py --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py @@ -789,6 +802,7 @@ deps = simplejson [testenv:pypy-sa6-simplejson] +basepython = python3 commands = {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.py --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py @@ -802,6 +816,7 @@ deps = simplejson [testenv:pypy-sa6-nolxml-json] +basepython = python3 commands = {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.py --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py @@ -813,6 +828,7 @@ deps = SQLAlchemy<=0.6.99 [testenv:pypy-sa6-nolxml] +basepython = python3 commands = {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.py --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py @@ -824,6 +840,7 @@ deps = SQLAlchemy<=0.6.99 [testenv:pypy-sa6-nolxml-simplejson] +basepython = python3 commands = {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.py --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py @@ -836,6 +853,7 @@ deps = simplejson [testenv:pypy-sa7-lxml-json] +basepython = python3 commands = {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.py --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py @@ -848,6 +866,7 @@ deps = lxml [testenv:pypy] +basepython = python3 commands = {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.py --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py @@ -860,6 +879,7 @@ deps = lxml [testenv:pypy-sa7-lxml-simplejson] +basepython = python3 commands = {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.py --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py @@ -873,6 +893,7 @@ deps = simplejson [testenv:pypy-simplejson] +basepython = python3 commands = {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.py --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py @@ -886,6 +907,7 @@ deps = simplejson [testenv:pypy-sa7-nolxml-json] +basepython = python3 commands = {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.py --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py @@ -897,6 +919,7 @@ deps = SQLAlchemy<=0.7.99 [testenv:pypy-nolxml] +basepython = python3 commands = {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.py --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py @@ -908,6 +931,7 @@ deps = SQLAlchemy<=0.7.99 [testenv:pypy-sa7-nolxml-simplejson] +basepython = python3 commands = {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.py --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py @@ -920,6 +944,7 @@ deps = simplejson [testenv:pypy-nolxml-simplejson] +basepython = python3 commands = {envbindir}/coverage run {envbindir}/nosetests --nologcapture --with-xunit --xunit-file nosetests-{envname}.xml wsme/tests wsmeext/tests tests/pecantest tests/test_sphinxext.py tests/test_flask.py --verbose {posargs} {envbindir}/coverage xml -o coverage-{envname}.xml wsme/*.py wsme/rest/*.py wsmeext/*.py