Commit c897b90c authored by Jason R. Coombs's avatar Jason R. Coombs

More directly disable coverage when running tests on pypy.

parent 4bac4653
...@@ -98,5 +98,3 @@ jobs: ...@@ -98,5 +98,3 @@ jobs:
python -m python -m
tox tox
--parallel auto --parallel auto
--
--cov
...@@ -5,7 +5,6 @@ jobs: ...@@ -5,7 +5,6 @@ jobs:
fast_finish: true fast_finish: true
include: include:
- python: pypy3 - python: pypy3
env: DISABLE_COVERAGE=1 # Don't run coverage on pypy (too slow).
- python: 3.5 - python: 3.5
- python: 3.6 - python: 3.6
- python: 3.7 - python: 3.7
...@@ -15,12 +14,12 @@ jobs: ...@@ -15,12 +14,12 @@ jobs:
env: LANG=C env: LANG=C
- python: 3.8-dev - python: 3.8-dev
- <<: *latest_py3 - <<: *latest_py3
env: TOXENV=docs DISABLE_COVERAGE=1 env: TOXENV=docs
allow_failures: allow_failures:
# suppress failures due to pypa/setuptools#2000 # suppress failures due to pypa/setuptools#2000
- python: pypy3 - python: pypy3
- <<: *latest_py3 - <<: *latest_py3
env: TOXENV=docs DISABLE_COVERAGE=1 env: TOXENV=docs
cache: pip cache: pip
...@@ -39,22 +38,8 @@ install: ...@@ -39,22 +38,8 @@ install:
script: script:
- export NETWORK_REQUIRED=1 - export NETWORK_REQUIRED=1
- | - tox
( # Run testsuite.
if [ -z "$DISABLE_COVERAGE" ]
then
tox -- --cov
else
tox
fi
)
after_success: after_success:
- | - export TRAVIS_JOB_NAME="${TRAVIS_PYTHON_VERSION} (LANG=$LANG)" CODECOV_ENV=TRAVIS_JOB_NAME
( # Upload coverage data. - tox -e coverage,codecov
if [ -z "$DISABLE_COVERAGE" ]
then
export TRAVIS_JOB_NAME="${TRAVIS_PYTHON_VERSION} (LANG=$LANG)" CODECOV_ENV=TRAVIS_JOB_NAME
tox -e coverage,codecov
fi
)
[pytest] [pytest]
addopts=--doctest-modules --flake8 --doctest-glob=pkg_resources/api_tests.txt -r sxX addopts=--doctest-modules --flake8 --doctest-glob=pkg_resources/api_tests.txt --cov -r sxX
norecursedirs=dist build *.egg setuptools/extern pkg_resources/extern pkg_resources/tests/data tools .* setuptools/_vendor pkg_resources/_vendor norecursedirs=dist build *.egg setuptools/extern pkg_resources/extern pkg_resources/tests/data tools .* setuptools/_vendor pkg_resources/_vendor
doctest_optionflags=ELLIPSIS ALLOW_UNICODE doctest_optionflags=ELLIPSIS ALLOW_UNICODE
filterwarnings = filterwarnings =
......
...@@ -23,12 +23,16 @@ setenv = ...@@ -23,12 +23,16 @@ setenv =
# TODO: The passed environment variables came from copying other tox.ini files # TODO: The passed environment variables came from copying other tox.ini files
# These should probably be individually annotated to explain what needs them. # These should probably be individually annotated to explain what needs them.
passenv=APPDATA HOMEDRIVE HOMEPATH windir Program* CommonProgram* VS* APPVEYOR APPVEYOR_* CI CODECOV_* TRAVIS TRAVIS_* NETWORK_REQUIRED passenv=APPDATA HOMEDRIVE HOMEPATH windir Program* CommonProgram* VS* APPVEYOR APPVEYOR_* CI CODECOV_* TRAVIS TRAVIS_* NETWORK_REQUIRED
commands=pytest {posargs} commands = pytest {posargs}
usedevelop=True usedevelop=True
extras = extras =
tests tests
[testenv:pypy{,3}]
commands = pytest --no-cov {posargs}
[testenv:coverage] [testenv:coverage]
description=Combine coverage data and create report description=Combine coverage data and create report
deps=coverage deps=coverage
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment