From b9c97a0540eae6eb38439c54a0ce9752652eb4b3 Mon Sep 17 00:00:00 2001 From: Andrew Coffey <49015102+oddbookworm@users.noreply.github.com> Date: Mon, 14 Jul 2025 01:29:09 -0500 Subject: [PATCH 1/2] Add pypy 3.11 support (#3527) * Add pypy 3.11 support * Upgrade cython version * Allow for numpy prerelease for pypy 3.11 * Numpy DOES have a full pypy 3.11 release... * drop pypy 3.9 Co-authored-by: Ankith * Skip numpy on manylinux x86_64 pypy 3.11 --------- Co-authored-by: Ankith --- pyproject.toml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pyproject.toml b/pyproject.toml index 7a068baeb2..84eca571dc 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -56,7 +56,7 @@ requires = [ "meson-python<=0.17.1", "meson<=1.7.0", "ninja<=1.12.1", - "cython<=3.0.11", + "cython<=3.1.2", "sphinx<=8.1.3", "sphinx-autoapi<=3.3.2", "pyproject-metadata!=0.9.1", @@ -75,7 +75,7 @@ install = ['--tags=runtime,python-runtime,pg-tag'] # dependencies. Here is where uv comes into the picture. It is an "installer" like pip, # but faster. It has been observed to save a couple of minutes of CI time. build-frontend = "build[uv]" -build = "cp3{9,10,11,12,13}-* pp3{9,10}-*" +build = "cp3{9,10,11,12,13}-* pp3{10,11}-*" skip = "*-musllinux_*" # build[uv] is verbose by default, so below flag is not needed here # build-verbosity = 3 @@ -118,5 +118,5 @@ only-binary = ["numpy"] # 1. skip all 32-bit manylinux (i686) # 2. skip all pypy+arm combinations [[tool.cibuildwheel.overrides]] -select = "{*-manylinux_i686,pp*-*{arm64,aarch64}}" +select = "{*-manylinux_i686,pp*-*{arm64,aarch64},pp311-manylinux_x86_64}" test-requires = [] From 8760aa72b8fe31c77b1c19854e06ad49b23d2176 Mon Sep 17 00:00:00 2001 From: Starbuck5 <46412508+Starbuck5@users.noreply.github.com> Date: Thu, 17 Jul 2025 00:20:29 -0700 Subject: [PATCH 2/2] Special-case allow builds on PRs to this branch --- .github/workflows/build-debian-multiarch.yml | 4 +++- .github/workflows/build-emsdk.yml | 4 +++- .github/workflows/build-macos.yml | 4 +++- .github/workflows/build-manylinux.yml | 4 +++- .github/workflows/build-on-msys2.yml | 4 +++- .github/workflows/build-sdl3.yml | 4 +++- .github/workflows/build-ubuntu-coverage.yml | 4 +++- .github/workflows/build-ubuntu-debug-python.yml | 4 +++- .github/workflows/build-ubuntu-sdist.yml | 4 +++- .github/workflows/build-windows.yml | 4 +++- .github/workflows/cppcheck.yml | 4 +++- .github/workflows/dev-check.yml | 4 +++- 12 files changed, 36 insertions(+), 12 deletions(-) diff --git a/.github/workflows/build-debian-multiarch.yml b/.github/workflows/build-debian-multiarch.yml index 927b5f841b..44d0b4bc84 100644 --- a/.github/workflows/build-debian-multiarch.yml +++ b/.github/workflows/build-debian-multiarch.yml @@ -20,7 +20,9 @@ on: - '!.github/workflows/build-debian-multiarch.yml' pull_request: - branches: main + branches: + - main + - 2.5.5-branch paths-ignore: - 'docs/**' - 'examples/**' diff --git a/.github/workflows/build-emsdk.yml b/.github/workflows/build-emsdk.yml index d61e0c5420..7e1413d7a8 100644 --- a/.github/workflows/build-emsdk.yml +++ b/.github/workflows/build-emsdk.yml @@ -16,7 +16,9 @@ on: - '!.github/workflows/build-emsdk.yml' pull_request: - branches: main + branches: + - main + - 2.5.5-branch paths-ignore: - 'docs/**' - 'examples/**' diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml index 7f4a007931..60f77e6abb 100644 --- a/.github/workflows/build-macos.yml +++ b/.github/workflows/build-macos.yml @@ -7,7 +7,9 @@ on: branches: main pull_request: - branches: main + branches: + - main + - 2.5.5-branch # the github release drafter can call this workflow workflow_call: diff --git a/.github/workflows/build-manylinux.yml b/.github/workflows/build-manylinux.yml index bf05a982de..fea79ee004 100644 --- a/.github/workflows/build-manylinux.yml +++ b/.github/workflows/build-manylinux.yml @@ -7,7 +7,9 @@ on: branches: main pull_request: - branches: main + branches: + - main + - 2.5.5-branch # the github release drafter can call this workflow workflow_call: diff --git a/.github/workflows/build-on-msys2.yml b/.github/workflows/build-on-msys2.yml index 0845aefce2..c8dbaa96a2 100644 --- a/.github/workflows/build-on-msys2.yml +++ b/.github/workflows/build-on-msys2.yml @@ -17,7 +17,9 @@ on: - '!.github/workflows/build-on-msys2.yml' pull_request: - branches: main + branches: + - main + - 2.5.5-branch paths-ignore: - 'docs/**' - 'examples/**' diff --git a/.github/workflows/build-sdl3.yml b/.github/workflows/build-sdl3.yml index ba21795d45..7a0eace8e1 100644 --- a/.github/workflows/build-sdl3.yml +++ b/.github/workflows/build-sdl3.yml @@ -18,7 +18,9 @@ on: - '!.github/workflows/build-sdl3.yml' pull_request: - branches: main + branches: + - main + - 2.5.5-branch paths-ignore: - 'docs/**' - 'examples/**' diff --git a/.github/workflows/build-ubuntu-coverage.yml b/.github/workflows/build-ubuntu-coverage.yml index 680481ba82..3f4a64b2d2 100644 --- a/.github/workflows/build-ubuntu-coverage.yml +++ b/.github/workflows/build-ubuntu-coverage.yml @@ -25,7 +25,9 @@ on: - '!.github/workflows/build-ubuntu-coverage.yml' pull_request: - branches: main + branches: + - main + - 2.5.5-branch paths-ignore: - 'docs/**' - 'examples/**' diff --git a/.github/workflows/build-ubuntu-debug-python.yml b/.github/workflows/build-ubuntu-debug-python.yml index b1c24766e5..ee38c5d865 100644 --- a/.github/workflows/build-ubuntu-debug-python.yml +++ b/.github/workflows/build-ubuntu-debug-python.yml @@ -26,7 +26,9 @@ on: - '!.github/workflows/build-ubuntu-debug-python.yml' pull_request: - branches: main + branches: + - main + - 2.5.5-branch paths-ignore: - 'docs/**' - 'examples/**' diff --git a/.github/workflows/build-ubuntu-sdist.yml b/.github/workflows/build-ubuntu-sdist.yml index d5123e7ede..b0ea499e1b 100644 --- a/.github/workflows/build-ubuntu-sdist.yml +++ b/.github/workflows/build-ubuntu-sdist.yml @@ -14,7 +14,9 @@ on: branches: main pull_request: - branches: main + branches: + - main + - 2.5.5-branch # the github release drafter can call this workflow workflow_call: diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml index abdf3c099b..a794de62ff 100644 --- a/.github/workflows/build-windows.yml +++ b/.github/workflows/build-windows.yml @@ -7,7 +7,9 @@ on: branches: main pull_request: - branches: main + branches: + - main + - 2.5.5-branch # the github release drafter can call this workflow workflow_call: diff --git a/.github/workflows/cppcheck.yml b/.github/workflows/cppcheck.yml index 2594db25d7..c510133370 100644 --- a/.github/workflows/cppcheck.yml +++ b/.github/workflows/cppcheck.yml @@ -8,7 +8,9 @@ on: - 'src_c/**' pull_request: - branches: main + branches: + - main + - 2.5.5-branch paths: - 'src_c/**' diff --git a/.github/workflows/dev-check.yml b/.github/workflows/dev-check.yml index 83d546df84..cd9a750fab 100644 --- a/.github/workflows/dev-check.yml +++ b/.github/workflows/dev-check.yml @@ -8,7 +8,9 @@ on: branches: main pull_request: - branches: main + branches: + - main + - 2.5.5-branch concurrency: group: ${{ github.workflow }}-${{ github.ref }}-dev-check