jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' into py37-by-default

This commit is contained in:
Bruno Oliveira 2018-11-12 14:03:59 -02:00 committed by GitHub
parent 0df5ce4082 93a9836962
commit 3cec1482eb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.travis.yml
View File

@ -55,7 +55,7 @@ jobs:
python: '3.4' python: '3.4'
- env: TOXENV=py36 - env: TOXENV=py36
python: '3.6' python: '3.6'
- env: TOXENV=linting,docs,doctesting PYTEST_NO_COVERAGE=1 - env: TOXENV=linting,docs,doctesting
python: '3.7' python: '3.7'
- stage: deploy - stage: deploy
@ -89,8 +89,8 @@ after_success:
- | - |
if [[ "$PYTEST_NO_COVERAGE" != 1 ]]; then if [[ "$PYTEST_NO_COVERAGE" != 1 ]]; then
set -e set -e
# Add first TOXENV to $PATH. # Add last TOXENV to $PATH.
PATH="$PWD/.tox/${TOXENV%%,*}/bin:$PATH" PATH="$PWD/.tox/${TOXENV##*,}/bin:$PATH"
coverage combine coverage combine
coverage xml --ignore-errors coverage xml --ignore-errors
coverage report -m --ignore-errors coverage report -m --ignore-errors

1
appveyor.yml
View File

@ -2,7 +2,6 @@ environment:
matrix: matrix:
- TOXENV: "py27" - TOXENV: "py27"
- TOXENV: "py37" - TOXENV: "py37"
PYTEST_NO_COVERAGE: "1"
- TOXENV: "linting,docs,doctesting" - TOXENV: "linting,docs,doctesting"
- TOXENV: "py36" - TOXENV: "py36"
- TOXENV: "py35" - TOXENV: "py35"