From b1781e4606a573b697e31f7297b23ce311c1e6b6 Mon Sep 17 00:00:00 2001 From: Matthieu Darbois Date: Wed, 14 Aug 2024 21:57:17 +0200 Subject: [PATCH] fix: AppVeyor CI tests & sample (#1971) --- CI.md | 10 +++++----- appveyor.yml | 22 +++++++++++----------- examples/appveyor-minimal.yml | 17 +++++++---------- 3 files changed, 23 insertions(+), 26 deletions(-) diff --git a/CI.md b/CI.md index 2c082e940..25b001bf9 100644 --- a/CI.md +++ b/CI.md @@ -1,10 +1,10 @@ This is a summary of the host Python versions and platforms covered by the different CI platforms: -| | 3.8 | 3.9 | 3.10 | 3.11 | 3.12 | -|---------|----------------------------------------------|-----------|-----------|---------|--------------------------------------| -| Linux | AppVeyor¹ / Azure Pipelines / GitHub Actions | Travis CI | Cirrus CI | | CircleCI¹ / GitHub Actions / GitLab¹ | -| macOS | AppVeyor¹ / Azure Pipelines | | Cirrus CI | GitLab¹ | CircleCI¹ / GitHub Actions | -| Windows | AppVeyor¹ / Azure Pipelines | Travis CI | Cirrus CI | | GitHub Actions / GitLab¹ | +| | 3.8 | 3.9 | 3.10 | 3.11 | 3.12 | +|---------|----------------------------------|-----------|-----------|---------|--------------------------------------------------| +| Linux | Azure Pipelines / GitHub Actions | Travis CI | Cirrus CI | | AppVeyor¹ / CircleCI¹ / GitHub Actions / GitLab¹ | +| macOS | Azure Pipelines | | Cirrus CI | GitLab¹ | AppVeyor¹ /CircleCI¹ / GitHub Actions | +| Windows | Azure Pipelines | Travis CI | Cirrus CI | | AppVeyor¹ / GitHub Actions / GitLab¹ | > ¹ Runs a reduced set of tests to reduce CI load diff --git a/appveyor.yml b/appveyor.yml index 4f12790da..349ad32e5 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,26 +1,26 @@ environment: matrix: - - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu - APPVEYOR_JOB_NAME: "python38-x64-ubuntu" - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - APPVEYOR_JOB_NAME: "python38-x64-vs2015" - - APPVEYOR_BUILD_WORKER_IMAGE: macos - APPVEYOR_JOB_NAME: "python38-x64-macos" + - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2204 + APPVEYOR_JOB_NAME: "python312-x64-ubuntu" + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 + APPVEYOR_JOB_NAME: "python312-x64-vs2022" + - APPVEYOR_BUILD_WORKER_IMAGE: macos-sonoma + APPVEYOR_JOB_NAME: "python312-x64-macos" -stack: python 3.8 +stack: python 3.12 build: off init: -- cmd: set PATH=C:\Python38;C:\Python38\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 (-not ($BRANCH -eq 'main' -or $BRANCH.ToLower().StartsWith('appveyor-'))) { - $env:PYTEST_ADDOPTS='-k "unit_test or test_0_basic" --suppress-no-test-exit-code' + $env:PYTEST_ADDOPTS = '-k "unit_test or test_0_basic" --suppress-no-test-exit-code' } - python -m pip install -U pip -install: python -m pip install -e ".[dev]" pytest-custom-exit-code +install: + - python -m pip install -U pip + - python -m pip install -e ".[dev]" pytest-custom-exit-code # the '-u' flag is required so the output is in the correct order. # See https://github.com/pypa/cibuildwheel/pull/24 for more info. diff --git a/examples/appveyor-minimal.yml b/examples/appveyor-minimal.yml index 1f12b8157..ddb13ec93 100644 --- a/examples/appveyor-minimal.yml +++ b/examples/appveyor-minimal.yml @@ -1,16 +1,13 @@ environment: matrix: - - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu - APPVEYOR_JOB_NAME: "python37-x64-ubuntu" - - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2015 - APPVEYOR_JOB_NAME: "python37-x64-vs2015" - - APPVEYOR_BUILD_WORKER_IMAGE: macos - APPVEYOR_JOB_NAME: "python37-x64-macos" + - APPVEYOR_BUILD_WORKER_IMAGE: Ubuntu2204 + APPVEYOR_JOB_NAME: "linux-x64" + - APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 + APPVEYOR_JOB_NAME: "windows-x64" + - APPVEYOR_BUILD_WORKER_IMAGE: macos-sonoma + APPVEYOR_JOB_NAME: "macos-x64" -stack: python 3.7 - -init: -- cmd: set PATH=C:\Python37;C:\Python37\Scripts;%PATH% +stack: python 3.12 install: python -m pip install cibuildwheel==2.20.0