Skip to content

Commit

Permalink
fix basepython usage in tox and update coverage endpoints to use a sp…
Browse files Browse the repository at this point in the history
…ecific version
  • Loading branch information
mmerickel committed Sep 30, 2019
1 parent ec43b33 commit 7d944cb
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 20 deletions.
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ matrix:
- python: 2.7
env: TOXENV=py27-pyramid15
- python: 3.5
env: TOXENV=py2-cover,py3-cover,coverage
env: TOXENV=py27-cover,py35-cover,coverage
- python: 3.5
env: TOXENV=docs

Expand Down
23 changes: 4 additions & 19 deletions tox.ini
Original file line number Diff line number Diff line change
Expand Up @@ -6,19 +6,6 @@ envlist =
{py2,py3}-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
pypy: pypy
pypy3: pypy3
py2: python2.7
py3: python3.4

deps =
pyramid15: pyramid <= 1.5.99
pyramid16: pyramid <= 1.6.99
Expand All @@ -34,37 +21,35 @@ extras =
testing

[testenv:docs]
basepython = python3.5
whitelist_externals = make
commands =
make -C docs html epub BUILDDIR={envdir}
extras =
docs

[testenv:py2-cover]
[testenv:py27-cover]
commands =
coverage run --source=pyramid_tm {envbindir}/nosetests
coverage xml -o coverage-py2.xml
setenv =
COVERAGE_FILE=.coverage.py2
COVERAGE_FILE=.coverage.py27
extras =
testing
deps =
pyramid_retry

[testenv:py3-cover]
[testenv:py35-cover]
commands =
coverage run --source=pyramid_tm {envbindir}/nosetests
coverage xml -o coverage-py3.xml
setenv =
COVERAGE_FILE=.coverage.py3
COVERAGE_FILE=.coverage.py35
extras =
testing
deps =
pyramid_retry

[testenv:coverage]
basepython = python3.5
commands =
coverage erase
coverage combine
Expand Down

0 comments on commit 7d944cb

Please sign in to comment.