diff --git a/.travis.yml b/.travis.yml index 83429f355..9616a0818 100644 --- a/.travis.yml +++ b/.travis.yml @@ -12,15 +12,15 @@ install: - python -m pip install --upgrade --pre tox env: matrix: - - TOXENV=py27 + - TOXENV=py27 PYTEST_COVERAGE=1 # Specialized factors for py27. - - TOXENV=py27-nobyte - - TOXENV=py27-xdist + - TOXENV=py27-nobyte PYTEST_COVERAGE=1 + - TOXENV=py27-xdist PYTEST_COVERAGE=1 - TOXENV=py27-pluggymaster-xdist # Specialized factors for py37. - TOXENV=py37-pexpect,py37-trial,py37-numpy - TOXENV=py37-pluggymaster-xdist - - TOXENV=py37-freeze PYTEST_NO_COVERAGE=1 + - TOXENV=py37-freeze matrix: allow_failures: @@ -30,9 +30,9 @@ matrix: jobs: include: # Coverage tracking is slow with pypy, skip it. - - env: TOXENV=pypy-xdist PYTEST_NO_COVERAGE=1 + - env: TOXENV=pypy-xdist python: 'pypy2.7-6.0' - - env: TOXENV=pypy3-xdist PYTEST_NO_COVERAGE=1 + - env: TOXENV=pypy3-xdist python: 'pypy3.5-6.0' - env: TOXENV=py34-xdist @@ -72,7 +72,6 @@ jobs: - stage: deploy python: '3.6' - env: PYTEST_NO_COVERAGE=1 install: pip install -U setuptools setuptools_scm script: skip deploy: @@ -88,7 +87,7 @@ jobs: before_script: - | - if [[ "$PYTEST_NO_COVERAGE" != 1 ]]; then + if [[ "$PYTEST_COVERAGE" = 1 ]]; then export COVERAGE_FILE="$PWD/.coverage" export COVERAGE_PROCESS_START="$PWD/.coveragerc" export _PYTEST_TOX_COVERAGE_RUN="coverage run -m" @@ -99,7 +98,7 @@ script: tox --recreate after_success: - | - if [[ "$PYTEST_NO_COVERAGE" != 1 ]]; then + if [[ "$PYTEST_COVERAGE" = 1 ]]; then set -e # Add last TOXENV to $PATH. PATH="$PWD/.tox/${TOXENV##*,}/bin:$PATH" diff --git a/appveyor.yml b/appveyor.yml index d00cd143f..230fc6b9f 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,6 @@ environment: + global: + PYTEST_NO_COVERAGE: "1" matrix: - TOXENV: "py37-xdist" - TOXENV: "py27-xdist" @@ -8,13 +10,11 @@ environment: - TOXENV: "py36-xdist" # NOTE: pypy-xdist is buggy currently (https://github.com/pytest-dev/pytest-xdist/issues/142). - TOXENV: "pypy" - PYTEST_NO_COVERAGE: "1" # Specialized factors for py27. - TOXENV: "py27-trial,py27-numpy,py27-nobyte" # Specialized factors for py37. - TOXENV: "py37-trial,py37-numpy" - TOXENV: "py37-freeze" - PYTEST_NO_COVERAGE: "1" matrix: fast_finish: true @@ -38,9 +38,6 @@ before_test: test_script: - python -m tox -on_success: - - call scripts\upload-coverage.bat - cache: - '%LOCALAPPDATA%\pip\cache' - '%USERPROFILE%\.cache\pre-commit'