From 90b8b571cf8e9aaf840379e5dbad45f324277c59 Mon Sep 17 00:00:00 2001 From: Oscar Benjamin Date: Mon, 23 Jun 2025 23:35:43 +0100 Subject: [PATCH 1/4] Bump from windows-2019 to windows-2022 in CI The windows-2019 image is no longer supported by GitHub Actions. --- .github/workflows/buildwheel.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/buildwheel.yml b/.github/workflows/buildwheel.yml index 8310e586..9310a080 100644 --- a/.github/workflows/buildwheel.yml +++ b/.github/workflows/buildwheel.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-24.04, ubuntu-24.04-arm, windows-2019, macos-13, macos-14] + os: [ubuntu-24.04, ubuntu-24.04-arm, windows-2022, macos-13, macos-14] steps: - uses: actions/checkout@v4 @@ -29,17 +29,17 @@ jobs: # problematic in some situations. Maybe there is a better way to do # this. path-type: inherit - if: ${{ matrix.os == 'windows-2019' }} + if: ${{ matrix.os == 'windows-2022' }} # Install pkgconfig on Windows from choco rather than from msys and # avoid using the Strawberry one. - run: choco install -y --stoponfirstfailure --checksum 6004DF17818F5A6DBF19CB335CC92702 pkgconfiglite - if: ${{ matrix.os == 'windows-2019' }} + if: ${{ matrix.os == 'windows-2022' }} # We have to set this here rather than in the cibuildwheel config # This is probably something to do with \ vs / in paths... - run: echo "PKG_CONFIG_PATH=${{ github.workspace }}/.local/lib/pkgconfig" >> $env:GITHUB_ENV - if: ${{ matrix.os == 'windows-2019' }} + if: ${{ matrix.os == 'windows-2022' }} - name: Build wheels uses: pypa/cibuildwheel@90a0ddeff0f23eebc21630e65d66d0f4955e9b94 # v3.0.0b1 @@ -83,7 +83,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-24.04, ubuntu-24.04-arm, windows-2019, macos-13, macos-14] + os: [ubuntu-24.04, ubuntu-24.04-arm, windows-2022, macos-13, macos-14] # This list to be kept in sync with python-requires in pyproject.toml. python-version: ['3.11', '3.12', '3.13', '3.13t', 'pypy3.11'] From 751a6d47737b1b8013c1a44845895fad73e36550 Mon Sep 17 00:00:00 2001 From: Oscar Benjamin Date: Tue, 24 Jun 2025 00:03:16 +0100 Subject: [PATCH 2/4] Temporarily disable the test in cibuildwheel --- pyproject.toml | 1 - 1 file changed, 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 0bcced1b..c24e171a 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -88,7 +88,6 @@ enable = ["cpython-freethreading", "pypy"] manylinux-x86_64-image = "manylinux2014" manylinux-aarch64-image = "manylinux_2_28" manylinux-i686-image = "manylinux2014" -test-command = "python -c \"import flint; print(str(flint.fmpz(2)))\"" [tool.cibuildwheel.linux.environment] # LD_LIBRARY_PATH is needed by auditwheel From 411696cce4e62f4af7e46a7bd357fd45bb3fd18b Mon Sep 17 00:00:00 2001 From: Oscar Benjamin Date: Tue, 24 Jun 2025 00:49:06 +0100 Subject: [PATCH 3/4] Build on windows-2019 but test on windows-2022 --- .github/workflows/buildwheel.yml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/buildwheel.yml b/.github/workflows/buildwheel.yml index 9310a080..94cfbf30 100644 --- a/.github/workflows/buildwheel.yml +++ b/.github/workflows/buildwheel.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-24.04, ubuntu-24.04-arm, windows-2022, macos-13, macos-14] + os: [ubuntu-24.04, ubuntu-24.04-arm, windows-2019, macos-13, macos-14] steps: - uses: actions/checkout@v4 @@ -29,17 +29,17 @@ jobs: # problematic in some situations. Maybe there is a better way to do # this. path-type: inherit - if: ${{ matrix.os == 'windows-2022' }} + if: ${{ matrix.os == 'windows-2019' }} # Install pkgconfig on Windows from choco rather than from msys and # avoid using the Strawberry one. - run: choco install -y --stoponfirstfailure --checksum 6004DF17818F5A6DBF19CB335CC92702 pkgconfiglite - if: ${{ matrix.os == 'windows-2022' }} + if: ${{ matrix.os == 'windows-2019' }} # We have to set this here rather than in the cibuildwheel config # This is probably something to do with \ vs / in paths... - run: echo "PKG_CONFIG_PATH=${{ github.workspace }}/.local/lib/pkgconfig" >> $env:GITHUB_ENV - if: ${{ matrix.os == 'windows-2022' }} + if: ${{ matrix.os == 'windows-2019' }} - name: Build wheels uses: pypa/cibuildwheel@90a0ddeff0f23eebc21630e65d66d0f4955e9b94 # v3.0.0b1 From e0f34506aa75c62c6d35af01b4fb66330b6e099e Mon Sep 17 00:00:00 2001 From: Oscar Benjamin Date: Tue, 24 Jun 2025 00:50:51 +0100 Subject: [PATCH 4/4] Build on windows-2022 but test on windows-2019 --- .github/workflows/buildwheel.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/buildwheel.yml b/.github/workflows/buildwheel.yml index 94cfbf30..cc42fe74 100644 --- a/.github/workflows/buildwheel.yml +++ b/.github/workflows/buildwheel.yml @@ -10,7 +10,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-24.04, ubuntu-24.04-arm, windows-2019, macos-13, macos-14] + os: [ubuntu-24.04, ubuntu-24.04-arm, windows-2022, macos-13, macos-14] steps: - uses: actions/checkout@v4 @@ -29,17 +29,17 @@ jobs: # problematic in some situations. Maybe there is a better way to do # this. path-type: inherit - if: ${{ matrix.os == 'windows-2019' }} + if: ${{ matrix.os == 'windows-2022' }} # Install pkgconfig on Windows from choco rather than from msys and # avoid using the Strawberry one. - run: choco install -y --stoponfirstfailure --checksum 6004DF17818F5A6DBF19CB335CC92702 pkgconfiglite - if: ${{ matrix.os == 'windows-2019' }} + if: ${{ matrix.os == 'windows-2022' }} # We have to set this here rather than in the cibuildwheel config # This is probably something to do with \ vs / in paths... - run: echo "PKG_CONFIG_PATH=${{ github.workspace }}/.local/lib/pkgconfig" >> $env:GITHUB_ENV - if: ${{ matrix.os == 'windows-2019' }} + if: ${{ matrix.os == 'windows-2022' }} - name: Build wheels uses: pypa/cibuildwheel@90a0ddeff0f23eebc21630e65d66d0f4955e9b94 # v3.0.0b1 @@ -83,7 +83,7 @@ jobs: strategy: fail-fast: false matrix: - os: [ubuntu-24.04, ubuntu-24.04-arm, windows-2022, macos-13, macos-14] + os: [ubuntu-24.04, ubuntu-24.04-arm, windows-2019, macos-13, macos-14] # This list to be kept in sync with python-requires in pyproject.toml. python-version: ['3.11', '3.12', '3.13', '3.13t', 'pypy3.11']