From 7f161b3cf46cae26980762b6d86558d4c1775dc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Vondru=C5=A1?= Date: Tue, 5 Dec 2023 23:21:25 +0100 Subject: [PATCH] package/ci: Python 3.6 is not on AppVeyor MSVC 2019+ images anymore. --- package/ci/appveyor-desktop-gles.bat | 4 ++-- package/ci/appveyor-desktop.bat | 4 ++-- package/ci/appveyor.yml | 29 ++++++++++++++-------------- 3 files changed, 19 insertions(+), 18 deletions(-) diff --git a/package/ci/appveyor-desktop-gles.bat b/package/ci/appveyor-desktop-gles.bat index e3bb095..8de9a13 100644 --- a/package/ci/appveyor-desktop-gles.bat +++ b/package/ci/appveyor-desktop-gles.bat @@ -8,7 +8,7 @@ cd pybind11-%PYBIND% || exit /b mkdir -p build && cd build || exit /b cmake .. ^ -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^ - -DPYBIND11_PYTHON_VERSION=3.6 ^ + -DPYBIND11_PYTHON_VERSION=3.%PYTHON% ^ -DPYBIND11_TEST=OFF ^ -G Ninja || exit /b ninja install || exit /b @@ -102,7 +102,7 @@ mkdir build && cd build || exit /b cmake .. ^ -DCMAKE_BUILD_TYPE=Release ^ -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^ - -DPYBIND11_PYTHON_VERSION=3.6 ^ + -DPYBIND11_PYTHON_VERSION=3.%PYTHON% ^ -DMAGNUM_WITH_PYTHON=ON ^ -DMAGNUM_BUILD_TESTS=ON ^ -G Ninja || exit /b diff --git a/package/ci/appveyor-desktop.bat b/package/ci/appveyor-desktop.bat index bf4cb8c..66a77c3 100644 --- a/package/ci/appveyor-desktop.bat +++ b/package/ci/appveyor-desktop.bat @@ -20,7 +20,7 @@ cd pybind11-%PYBIND% || exit /b mkdir -p build && cd build || exit /b cmake .. ^ -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^ - -DPYBIND11_PYTHON_VERSION=3.6 ^ + -DPYBIND11_PYTHON_VERSION=3.%PYTHON% ^ -DPYBIND11_TEST=OFF ^ -G Ninja || exit /b ninja install || exit /b @@ -113,7 +113,7 @@ cmake .. ^ -DCMAKE_BUILD_TYPE=Release ^ -DCMAKE_INSTALL_PREFIX=%APPVEYOR_BUILD_FOLDER%/deps ^ -DCMAKE_PREFIX_PATH=%APPVEYOR_BUILD_FOLDER%/SDL ^ - -DPYBIND11_PYTHON_VERSION=3.6 ^ + -DPYBIND11_PYTHON_VERSION=3.%PYTHON% ^ -DMAGNUM_WITH_PYTHON=ON ^ -DMAGNUM_BUILD_TESTS=ON ^ %COMPILER_EXTRA% -G Ninja || exit /b diff --git a/package/ci/appveyor.yml b/package/ci/appveyor.yml index 0469d8c..1b64ca4 100644 --- a/package/ci/appveyor.yml +++ b/package/ci/appveyor.yml @@ -6,33 +6,34 @@ environment: COMPILER: msvc APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2017 APPVEYOR_JOB_NAME: windows-msvc2017 - PYTHON: 36 + PYTHON: 6 PYBIND: 2.3.0 - TARGET: desktop COMPILER: msvc APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 APPVEYOR_JOB_NAME: windows-msvc2019 - PYTHON: 36 + # Python 3.6 was removed from 2019 and 2022 images in Dec 2023 + PYTHON: 7 PYBIND: 2.3.0 - TARGET: desktop COMPILER: msvc APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 APPVEYOR_JOB_NAME: windows-msvc2022 - PYTHON: 36 + PYTHON: 7 PYBIND: 2.9.0 # first supporting MSVC 2022 - TARGET: desktop COMPILER: msvc APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 APPVEYOR_JOB_NAME: windows-static-msvc2019 BUILD_STATIC: ON - PYTHON: 36 + PYTHON: 7 PYBIND: 2.3.0 - TARGET: desktop COMPILER: msvc APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 APPVEYOR_JOB_NAME: windows-static-msvc2022 BUILD_STATIC: ON - PYTHON: 36 + PYTHON: 7 PYBIND: 2.9.0 # first supporting MSVC 2022 # clang-cl crashes with pybind11, "Illegal instruction" and # lld-link: warning: ignoring unknown argument '-flto' @@ -42,13 +43,13 @@ environment: #COMPILER: msvc-clang #APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 #APPVEYOR_JOB_NAME: windows-msvc2019-clang - #PYTHON: 36 + #PYTHON: 7 #PYBIND: 2.7.0 #- TARGET: desktop #COMPILER: msvc-clang #APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 #APPVEYOR_JOB_NAME: windows-msvc2022-clang - #PYTHON: 36 + #PYTHON: 7 #PYBIND: 2.9.0 # first supporting MSVC 2022 - TARGET: desktop COMPILER: msvc @@ -56,7 +57,7 @@ environment: COMPILER_EXTRA: -DCMAKE_CXX_FLAGS="/permissive- /EHsc" -DMSVC_COMPATIBILITY=OFF APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 APPVEYOR_JOB_NAME: windows-conforming-msvc2019 - PYTHON: 36 + PYTHON: 7 PYBIND: 2.3.0 - TARGET: desktop COMPILER: msvc @@ -64,35 +65,35 @@ environment: COMPILER_EXTRA: -DCMAKE_CXX_FLAGS="/permissive- /EHsc" -DMSVC_COMPATIBILITY=OFF APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 APPVEYOR_JOB_NAME: windows-conforming-msvc2022 - PYTHON: 36 + PYTHON: 7 PYBIND: 2.9.0 # first supporting MSVC 2022 - TARGET: desktop-gles TARGET_GLES2: ON COMPILER: msvc APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 APPVEYOR_JOB_NAME: windows-gles2-msvc2019 - PYTHON: 36 + PYTHON: 7 PYBIND: 2.3.0 - TARGET: desktop-gles TARGET_GLES2: ON COMPILER: msvc APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 APPVEYOR_JOB_NAME: windows-gles2-msvc2022 - PYTHON: 36 + PYTHON: 7 PYBIND: 2.9.0 # first supporting MSVC 2022 - TARGET: desktop-gles TARGET_GLES2: OFF COMPILER: msvc APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2019 APPVEYOR_JOB_NAME: windows-gles3-msvc2019 - PYTHON: 36 + PYTHON: 7 PYBIND: 2.3.0 - TARGET: desktop-gles TARGET_GLES2: OFF COMPILER: msvc APPVEYOR_BUILD_WORKER_IMAGE: Visual Studio 2022 APPVEYOR_JOB_NAME: windows-gles3-msvc2022 - PYTHON: 36 + PYTHON: 7 PYBIND: 2.9.0 # first supporting MSVC 2022 install: @@ -106,7 +107,7 @@ install: - appveyor DownloadFile https://uploader.codecov.io/latest/windows/codecov.exe -FileName C:/tools/codecov.exe # pip is in Scripts -- set PATH=C:/tools/ninja;C:/Python%PYTHON%-x64;C:/Python%PYTHON%-x64/Scripts;%PATH% +- set PATH=C:/tools/ninja;C:/Python3%PYTHON%-x64;C:/Python3%PYTHON%-x64/Scripts;%PATH% - pip3 install coverage - IF NOT "%BUILD_STATIC%" == "ON" set BUILD_STATIC=OFF