From 3a3d1a4d2b70991c9ed1ed748a7fb9fee2d17ad3 Mon Sep 17 00:00:00 2001 From: Yannick Jadoul Date: Tue, 7 Apr 2020 00:27:14 +0200 Subject: [PATCH 1/3] Only run unit tests and 01_basic on AppVeyor --- appveyor.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index b3eaebc5..77c736e1 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -13,8 +13,9 @@ build: off init: - cmd: set PATH=C:\Python37;C:\Python37\Scripts;%PATH% +- ps: $env:PYTEST_ADDOPTS='-k "unit_test or _basic" --suppress-no-test-exit-code' -install: python -m pip install --retries 3 -r requirements-dev.txt +install: python -m pip install --retries 3 -r requirements-dev.txt pytest-custom-exit-code # the '-u' flag is required so the output is in the correct order. # See https://github.com/joerick/cibuildwheel/pull/24 for more info. From f38eb2644f74d915672e7c03b31080e1576e5f66 Mon Sep 17 00:00:00 2001 From: Yannick Jadoul Date: Wed, 8 Apr 2020 13:18:15 +0200 Subject: [PATCH 2/3] Run all tests on AppVeyor on master and appveyor-* branches --- appveyor.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/appveyor.yml b/appveyor.yml index 77c736e1..22621b5e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -13,7 +13,11 @@ build: off init: - cmd: set PATH=C:\Python37;C:\Python37\Scripts;%PATH% -- ps: $env:PYTEST_ADDOPTS='-k "unit_test or _basic" --suppress-no-test-exit-code' +- ps: | + $BRANCH = if ($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH) { $env:APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH } else { $env:APPVEYOR_REPO_BRANCH } + if ($BRANCH -eq 'master' -or $BRANCH.ToLower().StartsWith('appveyor-')) { + $env:PYTEST_ADDOPTS='-k "unit_test or _basic" --suppress-no-test-exit-code' + } install: python -m pip install --retries 3 -r requirements-dev.txt pytest-custom-exit-code From b0d99df00753ddab4865e2ca54dae9ccd1569081 Mon Sep 17 00:00:00 2001 From: Yannick Jadoul Date: Wed, 8 Apr 2020 13:30:19 +0200 Subject: [PATCH 3/3] Allow failure for macOS job on AppVeyor --- appveyor.yml | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index 22621b5e..d1297d00 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -7,6 +7,10 @@ environment: - APPVEYOR_BUILD_WORKER_IMAGE: macos-mojave APPVEYOR_JOB_NAME: "python37-x64-macos-mojave" +matrix: + allow_failures: + - APPVEYOR_BUILD_WORKER_IMAGE: macos-mojave + stack: python 3.7 build: off @@ -15,11 +19,11 @@ init: - cmd: set PATH=C:\Python37;C:\Python37\Scripts;%PATH% - ps: | $BRANCH = if ($env:APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH) { $env:APPVEYOR_PULL_REQUEST_HEAD_REPO_BRANCH } else { $env:APPVEYOR_REPO_BRANCH } - if ($BRANCH -eq 'master' -or $BRANCH.ToLower().StartsWith('appveyor-')) { + if (-not ($BRANCH -eq 'master' -or $BRANCH.ToLower().StartsWith('appveyor-'))) { $env:PYTEST_ADDOPTS='-k "unit_test or _basic" --suppress-no-test-exit-code' } -install: python -m pip install --retries 3 -r requirements-dev.txt pytest-custom-exit-code +install: python -m pip install -r requirements-dev.txt pytest-custom-exit-code # the '-u' flag is required so the output is in the correct order. # See https://github.com/joerick/cibuildwheel/pull/24 for more info.