diff options
| author | Michael Merickel <github@m.merickel.org> | 2018-11-26 17:10:21 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-11-26 17:10:21 -0600 |
| commit | 587fe72fae0efda3a860d37a1ea2449a41dab622 (patch) | |
| tree | ad938e23efd1be67821ddfb710748e746c92c420 /tox.ini | |
| parent | eea97ca673a53f8aa039a78e61833f78d5d59583 (diff) | |
| parent | 81171e861d25d394c0ccb8a6139a9b89dc4f039c (diff) | |
| download | pyramid-587fe72fae0efda3a860d37a1ea2449a41dab622.tar.gz pyramid-587fe72fae0efda3a860d37a1ea2449a41dab622.tar.bz2 pyramid-587fe72fae0efda3a860d37a1ea2449a41dab622.zip | |
Merge pull request #3421 from mmerickel/drop-py2
remove py2 from the codebase
Diffstat (limited to 'tox.ini')
| -rw-r--r-- | tox.ini | 49 |
1 files changed, 8 insertions, 41 deletions
@@ -1,29 +1,19 @@ [tox] envlist = lint, - py27,py34,py35,py36,py37,py38,pypy,pypy3, - docs,{py2,py3}-cover,coverage, + py34,py35,py36,py37,pypy3, + docs,py36-cover,coverage, [testenv] -# Most of these are defaults but if you specify any you can't fall back -# to defaults for others. -basepython = - py27: python2.7 - py34: python3.4 - py35: python3.5 - py36: python3.6 - py37: python3.7 - py38: python3.8 - pypy: pypy - pypy3: pypy3 - py2: python2.7 - py3: python3.6 - commands = - nosetests --with-xunit --xunit-file=nosetests-{envname}.xml {posargs:} - + cover: coverage run \ + {envbindir}/nosetests --with-xunit --xunit-file=nosetests-{envname}.xml {posargs:} extras = testing +deps = + cover: coverage +setenv = + COVERAGE_FILE=.coverage.{envname} [testenv:lint] skip_install = true @@ -56,32 +46,10 @@ commands = extras = docs -# we separate coverage into its own testenv because a) "last run wins" wrt -# cobertura jenkins reporting and b) pypy and jython can't handle any -# combination of versions of coverage and nosexcover that i can find. -[testenv:py2-cover] -commands = - coverage run {envbindir}/nosetests - coverage xml -o coverage-py2.xml -setenv = - COVERAGE_FILE=.coverage.py2 -extras = - testing - -[testenv:py3-cover] -commands = - coverage run {envbindir}/nosetests - coverage xml -o coverage-py3.xml -setenv = - COVERAGE_FILE=.coverage.py3 -extras = - testing - [testenv:coverage] skip_install = true basepython = python3.6 commands = - coverage erase coverage combine coverage xml coverage report --fail-under=100 @@ -109,7 +77,6 @@ commands = python setup.py sdist --dist-dir {toxinidir}/dist # build wheel from sdist pip wheel -v --no-deps --no-index --no-build-isolation --wheel-dir {toxinidir}/dist --find-links {toxinidir}/dist pyramid - deps = setuptools wheel |