From 8c8463b09450740db575624cabd934722efe1b4c Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Wed, 26 Jul 2023 17:34:14 -0700
Subject: [PATCH 1/4] cibuildwheel 2.14.1

gets CPython 3.12b4
---
 tools/wheel-requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/wheel-requirements.txt b/tools/wheel-requirements.txt
index 67904efc3..82b78c0ab 100644
--- a/tools/wheel-requirements.txt
+++ b/tools/wheel-requirements.txt
@@ -1,2 +1,2 @@
-cibuildwheel==2.13.0
+cibuildwheel==2.14.1
 delvewheel==0.0.22; sys_platform == 'win32'

From 703c682ac88376f8a3dce274db5198030ef79163 Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Wed, 26 Jul 2023 17:41:57 -0700
Subject: [PATCH 2/4] 25.1.1 changelog

---
 docs/source/changelog.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/docs/source/changelog.md b/docs/source/changelog.md
index 132f85305..bbdd8bed3 100644
--- a/docs/source/changelog.md
+++ b/docs/source/changelog.md
@@ -7,6 +7,20 @@ For a full changelog, consult the [git log](https://github.com/zeromq/pyzmq/comm
 
 ## 25
 
+### 25.1.1
+
+25.1.1 is the first stable release with Python 3.12 wheels.
+
+Changes:
+
+- Allow Cython 0.29.35 to build Python 3.12 wheels (no longer require Cython 3)
+
+Bugs fixed:
+
+- Fix builds on Solaris by including generated platform.hpp
+- Cleanup futures in `Socket.poll()`  that are cancelled and never return
+- Fix builds with `-j` when numpy is present in the build env
+
 ### 25.1.0
 
 pyzmq 25.1 mostly changes some packaging details of pyzmq, including support for installation from source on Python 3.12 beta 1.

From 27a372177b1076f7ea5befd6eb53d7484d52cec1 Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Thu, 10 Aug 2023 09:59:16 +0200
Subject: [PATCH 3/4] cibuildwheel 2.15.0

---
 tools/wheel-requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tools/wheel-requirements.txt b/tools/wheel-requirements.txt
index 82b78c0ab..0ddbaedac 100644
--- a/tools/wheel-requirements.txt
+++ b/tools/wheel-requirements.txt
@@ -1,2 +1,2 @@
-cibuildwheel==2.14.1
+cibuildwheel==2.15.0
 delvewheel==0.0.22; sys_platform == 'win32'

From 1f0b1b8e5c436645d0d82ca45398c281b4add524 Mon Sep 17 00:00:00 2001
From: Min RK <benjaminrk@gmail.com>
Date: Thu, 10 Aug 2023 10:01:05 +0200
Subject: [PATCH 4/4] no longer need prerelease to get 3.12 wheels

---
 .github/workflows/wheels.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/wheels.yml b/.github/workflows/wheels.yml
index 517808c4e..1752ee571 100644
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -22,7 +22,7 @@ concurrency:
 
 env:
   TWINE_NONINTERACTIVE: "1"
-  CIBW_PRERELEASE_PYTHONS: "1"
+#  CIBW_PRERELEASE_PYTHONS: "1"
 
 jobs:
   check-bundle: