Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand All @@ -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
Expand Down Expand Up @@ -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:
Expand All @@ -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"
Expand All @@ -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"
Expand Down
7 changes: 2 additions & 5 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
environment:
global:
PYTEST_NO_COVERAGE: "1"
matrix:
- TOXENV: "py37-xdist"
- TOXENV: "py27-xdist"
Expand All @@ -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
Expand All @@ -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'
Expand Down