From 96282424233029ce912e33efb36db0fc8ef91bf1 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sun, 11 Nov 2018 21:49:24 +0100 Subject: [PATCH 1/2] CI: doctesting uses coverage, fiy py37 on AppVeyor --- .travis.yml | 2 +- appveyor.yml | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3e3256a7dd1..37fc9ddec7f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -56,7 +56,7 @@ jobs: - env: TOXENV=py34 python: '3.4' - env: TOXENV=py36 - - env: TOXENV=linting,docs,doctesting PYTEST_NO_COVERAGE=1 + - env: TOXENV=linting,docs,doctesting - stage: deploy python: '3.6' diff --git a/appveyor.yml b/appveyor.yml index abe4319841c..1e287c3c26d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,7 +2,6 @@ environment: matrix: - TOXENV: "py27" - TOXENV: "py37" - PYTEST_NO_COVERAGE: "1" - TOXENV: "linting,docs,doctesting" - TOXENV: "py36" - TOXENV: "py35" From 74366426b9ea4ee15f2781a5e3d85b47a024e746 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sun, 11 Nov 2018 22:08:45 +0100 Subject: [PATCH 2/2] Travis: use last TOXENV for PATH --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 37fc9ddec7f..e5e270bf272 100644 --- a/.travis.yml +++ b/.travis.yml @@ -89,8 +89,8 @@ after_success: - | if [[ "$PYTEST_NO_COVERAGE" != 1 ]]; then set -e - # Add first TOXENV to $PATH. - PATH="$PWD/.tox/${TOXENV%%,*}/bin:$PATH" + # Add last TOXENV to $PATH. + PATH="$PWD/.tox/${TOXENV##*,}/bin:$PATH" coverage combine coverage xml --ignore-errors coverage report -m --ignore-errors