drop support for PyPy 3.9 and 3.10 (#5516)

davidhewitt · web-flow · commit c01d17f588e0 · 2025-10-15T16:54:22.000Z
* drop support for PyPy 3.9 and 3.10

* test fixup

* fixup another build config test
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -122,8 +122,8 @@ jobs:
               - '.github/workflows/build.yml'
 
       - name: Run pyo3-ffi-check
-        # pypy 3.9 on windows is not PEP 3123 compliant, nor is graalpy
-        if: ${{ endsWith(inputs.python-version, '-dev') || (steps.ffi-changes.outputs.changed == 'true' && inputs.rust == 'stable' && !startsWith(inputs.python-version, 'graalpy') && !(inputs.python-version == 'pypy3.9' && contains(inputs.os, 'windows'))) }}
+        # TODO: investigate graalpy failures
+        if: ${{ endsWith(inputs.python-version, '-dev') || (steps.ffi-changes.outputs.changed == 'true' && inputs.rust == 'stable' && !startsWith(inputs.python-version, 'graalpy')) }}
         run: nox -s ffi-check
 
       - name: Install cargo-llvm-cov
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -232,8 +232,6 @@ jobs:
             "3.13t",
             "3.14",
             "3.14t",
-            "pypy3.9",
-            "pypy3.10",
             "pypy3.11",
             "graalpy24.2",
           ]
diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ Requires Rust 1.74 or greater.
 
 PyO3 supports the following Python distributions:
   - CPython 3.7 or greater
-  - PyPy 7.3 (Python 3.9+)
+  - PyPy 7.3 (Python 3.11+)
   - GraalPy 24.2 or greater (Python 3.11+)
 
 You can use PyO3 to write a native Python module in Rust, or to embed Python in a Rust binary. The following sections explain each of these in turn.
diff --git a/newsfragments/5516.packaging.md b/newsfragments/5516.packaging.md
@@ -0,0 +1 @@
+Drop support for PyPy 3.9 and 3.10.
diff --git a/noxfile.py b/noxfile.py
@@ -953,8 +953,8 @@ def test_version_limits(session: nox.Session):
         env["PYO3_USE_ABI3_FORWARD_COMPATIBILITY"] = "1"
         _run_cargo(session, "check", env=env)
 
-        assert "3.8" not in PYPY_VERSIONS
-        config_file.set("PyPy", "3.8")
+        assert "3.10" not in PYPY_VERSIONS
+        config_file.set("PyPy", "3.10")
         _run_cargo(session, "check", env=env, expect_error=True)
 
     # attempt to build with latest version and check that abi3 version
diff --git a/pyo3-build-config/src/impl_.rs b/pyo3-build-config/src/impl_.rs
@@ -2462,7 +2462,7 @@ mod tests {
             pyo3_cross: None,
             pyo3_cross_lib_dir: None,
             pyo3_cross_python_implementation: Some("PyPy".into()),
-            pyo3_cross_python_version: Some("3.10".into()),
+            pyo3_cross_python_version: Some("3.11".into()),
         };
 
         let triple = triple!("x86_64-unknown-linux-gnu");
@@ -2477,11 +2477,11 @@ mod tests {
                 implementation: PythonImplementation::PyPy,
                 version: PythonVersion {
                     major: 3,
-                    minor: 10
+                    minor: 11
                 },
                 shared: true,
                 abi3: false,
-                lib_name: Some("pypy3.10-c".into()),
+                lib_name: Some("pypy3.11-c".into()),
                 lib_dir: None,
                 executable: None,
                 pointer_width: None,
@@ -2726,22 +2726,30 @@ mod tests {
             "python3.7md",
         );
 
-        // PyPy 3.9 includes ldversion
+        // PyPy 3.11 includes ldversion
         assert_eq!(
-            super::default_lib_name_unix(PythonVersion { major: 3, minor: 9 }, PyPy, None, false)
-                .unwrap(),
-            "pypy3.9-c",
+            super::default_lib_name_unix(
+                PythonVersion {
+                    major: 3,
+                    minor: 11
+                },
+                PyPy,
+                None,
+                false
+            )
+            .unwrap(),
+            "pypy3.11-c",
         );
 
         assert_eq!(
             super::default_lib_name_unix(
                 PythonVersion { major: 3, minor: 9 },
                 PyPy,
-                Some("3.9d"),
+                Some("3.11d"),
                 false
             )
             .unwrap(),
-            "pypy3.9d-c",
+            "pypy3.11d-c",
         );
 
         // free-threading adds a t suffix
@@ -3046,7 +3054,10 @@ mod tests {
     fn test_build_script_outputs_base() {
         let interpreter_config = InterpreterConfig {
             implementation: PythonImplementation::CPython,
-            version: PythonVersion { major: 3, minor: 9 },
+            version: PythonVersion {
+                major: 3,
+                minor: 11,
+            },
             shared: true,
             abi3: false,
             lib_name: Some("python3".into()),
@@ -3064,6 +3075,8 @@ mod tests {
                 "cargo:rustc-cfg=Py_3_7".to_owned(),
                 "cargo:rustc-cfg=Py_3_8".to_owned(),
                 "cargo:rustc-cfg=Py_3_9".to_owned(),
+                "cargo:rustc-cfg=Py_3_10".to_owned(),
+                "cargo:rustc-cfg=Py_3_11".to_owned(),
             ]
         );
 
@@ -3077,6 +3090,8 @@ mod tests {
                 "cargo:rustc-cfg=Py_3_7".to_owned(),
                 "cargo:rustc-cfg=Py_3_8".to_owned(),
                 "cargo:rustc-cfg=Py_3_9".to_owned(),
+                "cargo:rustc-cfg=Py_3_10".to_owned(),
+                "cargo:rustc-cfg=Py_3_11".to_owned(),
                 "cargo:rustc-cfg=PyPy".to_owned(),
             ]
         );
@@ -3253,9 +3268,13 @@ mod tests {
 
         // PyPy
         config.implementation = PythonImplementation::PyPy;
+        config.version = PythonVersion {
+            major: 3,
+            minor: 11,
+        };
         config.lib_name = None;
         config.apply_default_lib_name_to_config_file(&unix);
-        assert_eq!(config.lib_name, Some("pypy3.9-c".into()));
+        assert_eq!(config.lib_name, Some("pypy3.11-c".into()));
 
         config.implementation = PythonImplementation::CPython;
 
diff --git a/pyo3-ffi/Cargo.toml b/pyo3-ffi/Cargo.toml
@@ -54,5 +54,5 @@ min-version = "3.7"
 max-version = "3.14" # inclusive
 
 [package.metadata.pypy]
-min-version = "3.9"
+min-version = "3.11"
 max-version = "3.11" # inclusive
diff --git a/pyo3-ffi/build.rs b/pyo3-ffi/build.rs
@@ -22,7 +22,10 @@ const SUPPORTED_VERSIONS_CPYTHON: SupportedVersions = SupportedVersions {
 };
 
 const SUPPORTED_VERSIONS_PYPY: SupportedVersions = SupportedVersions {
-    min: PythonVersion { major: 3, minor: 9 },
+    min: PythonVersion {
+        major: 3,
+        minor: 11,
+    },
     max: SUPPORTED_VERSIONS_CPYTHON.max,
 };
 
diff --git a/pyo3-ffi/src/cpython/object.rs b/pyo3-ffi/src/cpython/object.rs
@@ -268,10 +268,8 @@ pub struct PyTypeObject {
     pub tp_vectorcall: Option<vectorcallfunc>,
     #[cfg(Py_3_12)]
     pub tp_watched: c_char,
-    #[cfg(any(all(PyPy, Py_3_8, not(Py_3_10)), all(not(PyPy), Py_3_8, not(Py_3_9))))]
+    #[cfg(all(not(PyPy), Py_3_8, not(Py_3_9)))]
     pub tp_print: Option<printfunc>,
-    #[cfg(all(PyPy, not(Py_3_10)))]
-    pub tp_pypy_flags: std::ffi::c_long,
     #[cfg(py_sys_config = "COUNT_ALLOCS")]
     pub tp_allocs: Py_ssize_t,
     #[cfg(py_sys_config = "COUNT_ALLOCS")]
diff --git a/pyo3-ffi/src/lib.rs b/pyo3-ffi/src/lib.rs
@@ -81,7 +81,7 @@
 //!
 //! `pyo3-ffi` supports the following Python distributions:
 //!   - CPython 3.7 or greater
-//!   - PyPy 7.3 (Python 3.9+)
+//!   - PyPy 7.3 (Python 3.11+)
 //!   - GraalPy 24.0 or greater (Python 3.10+)
 //!
 //! # Example: Building Python Native modules
diff --git a/pyo3-ffi/src/object.rs b/pyo3-ffi/src/object.rs
@@ -152,13 +152,13 @@ pub struct PyVarObject {
 // skipped private _PyVarObject_CAST
 
 #[inline]
-#[cfg(not(any(GraalPy, all(PyPy, Py_3_10))))]
+#[cfg(not(any(GraalPy, PyPy)))]
 #[cfg_attr(docsrs, doc(cfg(all())))]
 pub unsafe fn Py_Is(x: *mut PyObject, y: *mut PyObject) -> c_int {
     (x == y).into()
 }
 
-#[cfg(any(GraalPy, all(PyPy, Py_3_10)))]
+#[cfg(any(GraalPy, PyPy))]
 #[cfg_attr(docsrs, doc(cfg(all())))]
 extern "C" {
     #[cfg_attr(PyPy, link_name = "PyPy_Is")]
diff --git a/pyo3-ffi/src/pybuffer.rs b/pyo3-ffi/src/pybuffer.rs
@@ -103,11 +103,7 @@ extern "C" {
 }
 
 /// Maximum number of dimensions
-pub const PyBUF_MAX_NDIM: usize = if cfg!(all(PyPy, not(Py_3_11))) {
-    36
-} else {
-    64
-};
+pub const PyBUF_MAX_NDIM: usize = 64;
 
 /* Flags for getting buffers */
 pub const PyBUF_SIMPLE: c_int = 0;
diff --git a/pyo3-ffi/src/pystate.rs b/pyo3-ffi/src/pystate.rs
@@ -36,8 +36,7 @@ extern "C" {
     #[cfg_attr(PyPy, link_name = "PyPyState_RemoveModule")]
     pub fn PyState_RemoveModule(arg1: *mut PyModuleDef) -> c_int;
 
-    // only has PyPy prefix since 3.10
-    #[cfg_attr(all(PyPy, Py_3_10), link_name = "PyPyState_FindModule")]
+    #[cfg_attr(PyPy, link_name = "PyPyState_FindModule")]
     pub fn PyState_FindModule(arg1: *mut PyModuleDef) -> *mut PyObject;
 
     #[cfg_attr(PyPy, link_name = "PyPyThreadState_New")]
diff --git a/pyo3-ffi/src/sliceobject.rs b/pyo3-ffi/src/sliceobject.rs
@@ -93,7 +93,7 @@ extern "C" {
         step: *mut Py_ssize_t,
     ) -> c_int;
 
-    #[cfg_attr(all(PyPy, Py_3_10), link_name = "PyPySlice_AdjustIndices")]
+    #[cfg_attr(PyPy, link_name = "PyPySlice_AdjustIndices")]
     pub fn PySlice_AdjustIndices(
         length: Py_ssize_t,
         start: *mut Py_ssize_t,
diff --git a/src/ffi/tests.rs b/src/ffi/tests.rs
@@ -262,7 +262,6 @@ fn ucs4() {
 #[test]
 #[cfg(not(Py_LIMITED_API))]
 #[cfg_attr(target_arch = "wasm32", ignore)] // DateTime import fails on wasm for mysterious reasons
-#[cfg(not(all(PyPy, not(Py_3_10))))]
 fn test_get_tzinfo() {
     use crate::types::PyTzInfo;
 
diff --git a/src/lib.rs b/src/lib.rs
@@ -152,7 +152,7 @@
 //!
 //! PyO3 supports the following Python distributions:
 //!   - CPython 3.7 or greater
-//!   - PyPy 7.3 (Python 3.9+)
+//!   - PyPy 7.3 (Python 3.11+)
 //!   - GraalPy 24.0 or greater (Python 3.10+)
 //!
 //! # Example: Building a native Python module
diff --git a/src/pyclass/create_type_object.rs b/src/pyclass/create_type_object.rs
@@ -345,8 +345,7 @@ impl PyTypeBuilder {
         if !slice.is_empty() {
             unsafe { self.push_slot(ffi::Py_tp_doc, type_doc.as_ptr() as *mut c_char) }
 
-            // Running this causes PyPy to segfault.
-            #[cfg(all(not(PyPy), not(Py_LIMITED_API), not(Py_3_10)))]
+            #[cfg(all(not(Py_LIMITED_API), not(Py_3_10)))]
             {
                 // Until CPython 3.10, tp_doc was treated specially for
                 // heap-types, and it removed the text_signature value from it.
@@ -437,13 +436,12 @@ impl PyTypeBuilder {
         unsafe { self.push_slot(ffi::Py_tp_base, self.tp_base) }
 
         if !self.has_new {
-            // Flag introduced in 3.10, only worked in PyPy on 3.11
-            #[cfg(not(any(all(Py_3_10, not(PyPy)), all(Py_3_11, PyPy))))]
+            #[cfg(not(Py_3_10))]
             {
                 // Safety: This is the correct slot type for Py_tp_new
                 unsafe { self.push_slot(ffi::Py_tp_new, no_constructor_defined as *mut c_void) }
             }
-            #[cfg(any(all(Py_3_10, not(PyPy)), all(Py_3_11, PyPy)))]
+            #[cfg(Py_3_10)]
             {
                 self.class_flags |= ffi::Py_TPFLAGS_DISALLOW_INSTANTIATION;
             }
@@ -557,7 +555,7 @@ fn bpo_45315_workaround(py: Python<'_>, class_name: CString) {
 }
 
 /// Default new implementation
-#[cfg(not(any(all(Py_3_10, not(PyPy)), all(Py_3_11, PyPy))))]
+#[cfg(not(Py_3_10))]
 unsafe extern "C" fn no_constructor_defined(
     subtype: *mut ffi::PyTypeObject,
     _args: *mut ffi::PyObject,
diff --git a/src/types/mod.rs b/src/types/mod.rs
@@ -22,7 +22,7 @@ pub use self::float::{PyFloat, PyFloatMethods};
 pub use self::frame::PyFrame;
 pub use self::frozenset::{PyFrozenSet, PyFrozenSetBuilder, PyFrozenSetMethods};
 pub use self::function::PyCFunction;
-#[cfg(all(not(Py_LIMITED_API), not(all(PyPy, not(Py_3_8)))))]
+#[cfg(not(Py_LIMITED_API))]
 pub use self::function::PyFunction;
 #[cfg(Py_3_9)]
 pub use self::genericalias::PyGenericAlias;

Original file line number	Diff line number	Diff line change
`@@ -232,8 +232,6 @@ jobs:`
`232`	`232`	`"3.13t",`
`233`	`233`	`"3.14",`
`234`	`234`	`"3.14t",`
`235`		`- "pypy3.9",`
`236`		`- "pypy3.10",`
`237`	`235`	`"pypy3.11",`
`238`	`236`	`"graalpy24.2",`
`239`	`237`	`]`