From 46f54f95c2d4bbbed52271b68860c98fca4a7808 Mon Sep 17 00:00:00 2001 From: Sylwester Arabas Date: Fri, 1 Nov 2024 00:03:48 +0100 Subject: [PATCH 1/7] add Python 3.12 to list of Linux builds on CI --- .github/workflows/tests+pypi.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/tests+pypi.yml b/.github/workflows/tests+pypi.yml index 87353e34..ebc9a8cb 100644 --- a/.github/workflows/tests+pypi.yml +++ b/.github/workflows/tests+pypi.yml @@ -90,6 +90,9 @@ jobs: - manylinux: "manylinux_2_24_x86_64" platform: ubuntu-latest python-version: "3.11" + - manylinux: "manylinux_2_24_x86_64" + platform: ubuntu-latest + python-version: "3.12" fail-fast: false runs-on: ${{ matrix.platform }} steps: From d26ec0e5a1e9fba1cc090c0538b1e07190808c47 Mon Sep 17 00:00:00 2001 From: Sylwester Arabas Date: Fri, 1 Nov 2024 10:32:08 +0100 Subject: [PATCH 2/7] add Windows and macOS 3.12 builds; pin pip to a newer version to fix compatibility with P3.12 --- .github/workflows/tests+pypi.yml | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests+pypi.yml b/.github/workflows/tests+pypi.yml index ebc9a8cb..886f5aec 100644 --- a/.github/workflows/tests+pypi.yml +++ b/.github/workflows/tests+pypi.yml @@ -49,6 +49,8 @@ jobs: python-version: "3.10" - platform: windows-latest python-version: "3.11" + - platform: windows-latest + python-version: "3.12" - platform: macos-12 python-version: "3.7" - platform: macos-12 @@ -59,10 +61,14 @@ jobs: python-version: "3.10" - platform: macos-12 python-version: "3.11" + - platform: macos-12 + python-version: "3.12" - platform: macos-14 python-version: "3.10" - platform: macos-14 python-version: "3.11" + - platform: macos-14 + python-version: "3.12" - manylinux: "manylinux2010_x86_64" platform: ubuntu-latest python-version: "3.7" @@ -132,7 +138,7 @@ jobs: - uses: actions/setup-python@v5.0.0 with: python-version: ${{ matrix.python-version }} - - run: python -m pip install --upgrade pip==22.1.2 + - run: python -m pip install --upgrade pip==24.3.1 - run: python -m pip install $PIP_INSTALL_OPTS "build<1.1" wheel - run: cmake --version From 849052f4e37c2cbfebf8f26985b0d6bb488a9bea Mon Sep 17 00:00:00 2001 From: Sylwester Arabas Date: Fri, 1 Nov 2024 10:44:50 +0100 Subject: [PATCH 3/7] drop Python 3.7 from CI builds - it reached EOL and is incompatible with current pip --- .github/workflows/tests+pypi.yml | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/.github/workflows/tests+pypi.yml b/.github/workflows/tests+pypi.yml index 886f5aec..341638a1 100644 --- a/.github/workflows/tests+pypi.yml +++ b/.github/workflows/tests+pypi.yml @@ -39,8 +39,6 @@ jobs: strategy: matrix: include: - - platform: windows-latest - python-version: "3.7" - platform: windows-latest python-version: "3.8" - platform: windows-latest @@ -51,8 +49,6 @@ jobs: python-version: "3.11" - platform: windows-latest python-version: "3.12" - - platform: macos-12 - python-version: "3.7" - platform: macos-12 python-version: "3.8" - platform: macos-12 @@ -69,9 +65,6 @@ jobs: python-version: "3.11" - platform: macos-14 python-version: "3.12" - - manylinux: "manylinux2010_x86_64" - platform: ubuntu-latest - python-version: "3.7" - manylinux: "manylinux2010_x86_64" platform: ubuntu-latest python-version: "3.8" @@ -81,9 +74,6 @@ jobs: - manylinux: "manylinux2010_x86_64" platform: ubuntu-latest python-version: "3.10" - - manylinux: "manylinux_2_24_x86_64" - platform: ubuntu-latest - python-version: "3.7" - manylinux: "manylinux_2_24_x86_64" platform: ubuntu-latest python-version: "3.8" @@ -206,8 +196,7 @@ jobs: python -m pytest --durations=10 -v -s -We -p no:unraisableexception . cd .. - - if: matrix.python-version != '3.7' - run: | + - run: | python -m pip install $PIP_INSTALL_OPTS -r gitmodules/devops_tests/requirements.txt ex -sc 'g/^PyPartMC/d' -cx .binder/requirements.txt python -m pip install $PIP_INSTALL_OPTS -r .binder/requirements.txt From dfb9a7ef8aa2413a1a7d23922085384b5fa27ab9 Mon Sep 17 00:00:00 2001 From: Sylwester Arabas Date: Fri, 1 Nov 2024 11:35:40 +0100 Subject: [PATCH 4/7] try installint P3.12 using yum on manylinux image --- .github/workflows/tests+pypi.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/tests+pypi.yml b/.github/workflows/tests+pypi.yml index 341638a1..f0668b17 100644 --- a/.github/workflows/tests+pypi.yml +++ b/.github/workflows/tests+pypi.yml @@ -169,6 +169,7 @@ jobs: python-versions: ${{ env.PV }} build-requirements: 'setuptools_scm' pre-build-command: 'git config --global --add safe.directory "*"' + system-packages: 'python3.12' - if: matrix.platform == 'ubuntu-latest' run: rm dist/*-linux_* From a768d8de94077f512e223901f21bb4acb1e19dc3 Mon Sep 17 00:00:00 2001 From: Sylwester Arabas Date: Thu, 5 Dec 2024 21:57:11 +0100 Subject: [PATCH 5/7] add Python 3.13 to macOS and Windows builds, remove 3.12 from manylinux --- .github/workflows/tests+pypi.yml | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests+pypi.yml b/.github/workflows/tests+pypi.yml index f0668b17..aa56ab3e 100644 --- a/.github/workflows/tests+pypi.yml +++ b/.github/workflows/tests+pypi.yml @@ -49,6 +49,8 @@ jobs: python-version: "3.11" - platform: windows-latest python-version: "3.12" + - platform: windows-latest + python-version: "3.13" - platform: macos-12 python-version: "3.8" - platform: macos-12 @@ -59,12 +61,16 @@ jobs: python-version: "3.11" - platform: macos-12 python-version: "3.12" + - platform: macos-12 + python-version: "3.13" - platform: macos-14 python-version: "3.10" - platform: macos-14 python-version: "3.11" - platform: macos-14 python-version: "3.12" + - platform: macos-14 + python-version: "3.13" - manylinux: "manylinux2010_x86_64" platform: ubuntu-latest python-version: "3.8" @@ -86,9 +92,6 @@ jobs: - manylinux: "manylinux_2_24_x86_64" platform: ubuntu-latest python-version: "3.11" - - manylinux: "manylinux_2_24_x86_64" - platform: ubuntu-latest - python-version: "3.12" fail-fast: false runs-on: ${{ matrix.platform }} steps: @@ -169,7 +172,6 @@ jobs: python-versions: ${{ env.PV }} build-requirements: 'setuptools_scm' pre-build-command: 'git config --global --add safe.directory "*"' - system-packages: 'python3.12' - if: matrix.platform == 'ubuntu-latest' run: rm dist/*-linux_* From 00c6670d0464f3f3f13da17e29659c346614017a Mon Sep 17 00:00:00 2001 From: Sylwester Arabas Date: Thu, 5 Dec 2024 22:22:32 +0100 Subject: [PATCH 6/7] remove P13 on Windows, fix macos vm names --- .github/workflows/tests+pypi.yml | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/.github/workflows/tests+pypi.yml b/.github/workflows/tests+pypi.yml index c28eb879..8d53fca3 100644 --- a/.github/workflows/tests+pypi.yml +++ b/.github/workflows/tests+pypi.yml @@ -49,8 +49,6 @@ jobs: python-version: "3.11" - platform: windows-latest python-version: "3.12" - - platform: windows-latest - python-version: "3.13" - platform: macos-13 python-version: "3.8" - platform: macos-13 @@ -59,9 +57,9 @@ jobs: python-version: "3.10" - platform: macos-13 python-version: "3.11" - - platform: macos-12 + - platform: macos-13 python-version: "3.12" - - platform: macos-12 + - platform: macos-13 python-version: "3.13" - platform: macos-14 python-version: "3.10" From 586126afebe05ff60cf8f67d356d01eab954bd18 Mon Sep 17 00:00:00 2001 From: Sylwester Arabas Date: Thu, 5 Dec 2024 23:47:18 +0100 Subject: [PATCH 7/7] remove P3.13 (due to PyMieScatt incompatibility) --- .github/workflows/tests+pypi.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/tests+pypi.yml b/.github/workflows/tests+pypi.yml index 8d53fca3..350e23fb 100644 --- a/.github/workflows/tests+pypi.yml +++ b/.github/workflows/tests+pypi.yml @@ -59,16 +59,12 @@ jobs: python-version: "3.11" - platform: macos-13 python-version: "3.12" - - platform: macos-13 - python-version: "3.13" - platform: macos-14 python-version: "3.10" - platform: macos-14 python-version: "3.11" - platform: macos-14 python-version: "3.12" - - platform: macos-14 - python-version: "3.13" - manylinux: "manylinux2010_x86_64" platform: ubuntu-latest python-version: "3.8"