Require Python 3.11 or newer; remove outdated workarounds

Author: tobiasdiez

.github/workflows/dist.yml

@@ -188,7 +188,7 @@ jobs:
       #
       CIBW_ARCHS: ${{ matrix.arch }}
       # https://cibuildwheel.readthedocs.io/en/stable/options/#requires-python
-      CIBW_PROJECT_REQUIRES_PYTHON: ">=3.9, <3.13"
+      CIBW_PROJECT_REQUIRES_PYTHON: ">=3.11, <3.13"
       # Environment during wheel build
       CIBW_ENVIRONMENT: "PATH=$(pwd)/prefix/bin:$PATH CPATH=$(pwd)/prefix/include:$CPATH LIBRARY_PATH=$(pwd)/prefix/lib:$LIBRARY_PATH LD_LIBRARY_PATH=$(pwd)/prefix/lib:$LD_LIBRARY_PATH PKG_CONFIG_PATH=$(pwd)/prefix/share/pkgconfig:$PKG_CONFIG_PATH ACLOCAL_PATH=/usr/share/aclocal PIP_CONSTRAINT=$(pwd)/constraints.txt PIP_FIND_LINKS=file://$(pwd)/wheelhouse SAGE_NUM_THREADS=6"
       # Use 'build', not 'pip wheel'

.gitignore

@@ -161,7 +161,6 @@ __pycache__/
 /src/sage/modular/arithgroup/farey_symbol.h
 # List of C and C++ files that are actual source files,
 # NOT generated by Cython. The same list appears in src/MANIFEST.in
-!/src/sage/cpython/debugimpl.c
 !/src/sage/graphs/base/boost_interface.cpp
 !/src/sage/graphs/cliquer/cl.c
 !/src/sage/graphs/graph_decompositions/sage_tdlib.cpp

README.md

@@ -222,7 +222,7 @@ in the Installation Guide.
       more details.
 
     - Python 3.4 or later, or Python 2.7, a full installation including
-      `urllib`; but ideally version 3.9.x, 3.10.x, 3.11.x, 3.12.x, which
+      `urllib`; but ideally version 3.11.x or later, which
       will avoid having to build Sage's own copy of Python 3.
       See [build/pkgs/python3/SPKG.rst](build/pkgs/python3/SPKG.rst)
       for more details.
@@ -551,11 +551,11 @@ SAGE_ROOT                 Root directory (create by git clone)
 │       │   ├── installed/
 │       │   │             Records of installed non-Python packages
 │       │   ├── scripts/  Scripts for uninstalling installed packages
-│       │   └── venv-python3.9  (SAGE_VENV)
+│       │   └── venv-python  (SAGE_VENV)
 │       │       │         Installation hierarchy (virtual environment)
 │       │       │         for Python packages
 │       │       ├── bin/  Executables and installed scripts
-│       │       ├── lib/python3.9/site-packages/
+│       │       ├── lib/python/site-packages/
 │       │       │         Python modules/packages are installed here
 │       │       └── var/lib/sage/
 │       │           └── wheels/

pyproject.toml

@@ -70,15 +70,13 @@ classifiers = [
     "Operating System :: POSIX",
     "Operating System :: MacOS :: MacOS X",
     "Programming Language :: Python :: 3 :: Only",
-    "Programming Language :: Python :: 3.9",
-    "Programming Language :: Python :: 3.10",
     "Programming Language :: Python :: 3.11",
     "Programming Language :: Python :: 3.12",
     "Programming Language :: Python :: Implementation :: CPython",
     "Topic :: Scientific/Engineering :: Mathematics",
 ]
 urls = {Homepage = "https://www.sagemath.org"}
-requires-python = ">=3.9, <3.13"
+requires-python = ">=3.11, <3.13"
 
 [project.optional-dependencies]
 R = [

pyrightconfig.json

@@ -7,7 +7,7 @@
         "root": "src"
       }
     ],  
-    "pythonVersion": "3.9",
+    "pythonVersion": "3.11",
     "exclude": ["venv"],
     "venvPath": "./venv/",
     "venv": "./",

ruff.toml

@@ -1,7 +1,7 @@
 # https://docs.astral.sh/ruff/configuration/#config-file-discovery
 
-# Assume Python 3.9
-target-version = "py39"
+# Python 3.11 is the minimum supported version
+target-version = "py311"
 
 lint.select = [
     "E", # pycodestyle errors - https://docs.astral.sh/ruff/rules/#error-e

src/MANIFEST.in

@@ -23,7 +23,6 @@ global-exclude *.cpp
 # List of C and C++ files that are actual source files,
 # NOT generated by Cython. The same list appears in SAGE_ROOT/.gitignore
 #
-include sage/cpython/debugimpl.c
 include sage/graphs/base/boost_interface.cpp
 include sage/graphs/cliquer/cl.c
 include sage/libs/eclib/wrap.cpp

src/doc/en/developer/coding_in_python.rst

@@ -12,17 +12,14 @@ Sage.
 Python language standard
 ========================
 
-Sage library code needs to be compatible with all versions of Python
-that Sage supports.  The information regarding the supported versions
-can be found in the files ``build/pkgs/python3/spkg-configure.m4`` and
-``src/setup.cfg.m4``.
-
-Python 3.9 is the oldest supported version.  Hence,
-all language and library features that are available in Python 3.9 can
-be used; but features introduced in Python 3.10 cannot be used.  If a
-feature is deprecated in a newer supported version, it must be ensured
-that deprecation warnings issued by Python do not lead to failures in
-doctests.
+Sage follows the time window-based support policy
+`SPEC 0 — Minimum Supported Dependencies <https://scientific-python.org/specs/spec-0000/>`_
+for Python versions.
+The current minimum supported Python version can be found in the 
+``pyproject.toml`` file. Accordingly, only language and library features 
+available in this version can be used. If a feature is deprecated in a newer 
+supported version, it must be ensured that deprecation warnings issued by
+Python do not lead to failures in doctests.
 
 Some key language and library features have been backported to older Python versions
 using one of two mechanisms:
@@ -34,21 +31,9 @@ using one of two mechanisms:
   of annotations).  All Sage library code that uses type annotations
   should include this ``__future__`` import and follow PEP 563.
 
-- Backport packages
-
-  - `importlib_metadata <../reference/spkg/importlib_metadata>`_
-    (to be used in place of ``importlib.metadata``),
-  - `importlib_resources <../reference/spkg/importlib_resources>`_
-    (to be used in place of ``importlib.resources``),
-  - `typing_extensions <../reference/spkg/typing_extensions>`_
-    (to be used in place of ``typing``).
-
-  The Sage library declares these packages as dependencies and ensures that
-  versions that provide features of Python 3.11 are available.
-
-Meta :issue:`29756` keeps track of newer Python features and serves
-as a starting point for discussions on how to make use of them in the
-Sage library.
+- The `typing_extensions <../reference/spkg/typing_extensions>`_ package
+  is used to backport features from newer versions of the ``typing`` module.
+  The Sage library declares this package as a dependency.
 
 
 Design

src/doc/en/installation/conda.rst

@@ -50,7 +50,7 @@ Create a new conda environment containing SageMath, either with ``mamba`` or ``c
 
       $ conda create -n sage sage python=X
 
-where ``X`` is version of Python, e.g. ``3.9``.
+where ``X`` is version of Python, e.g. ``3.12``.
 
 To use Sage from there,
 
@@ -86,22 +86,22 @@ Here we assume that you are using a git checkout.
 
     .. code-block:: shell
 
-        $ mamba env create --file environment-3.11-linux.yml --name sage-dev
+        $ mamba env create --file environment-3.12-linux.yml --name sage-dev
         $ conda activate sage-dev
 
   .. tab:: conda
 
     .. code-block:: shell
 
-        $ conda env create --file environment-3.11-linux.yml --name sage-dev
+        $ conda env create --file environment-3.12-linux.yml --name sage-dev
         $ conda activate sage-dev
 
-  Alternatively, you can use ``environment-3.11-linux.yml`` or
-  ``environment-optional-3.11-linux.yml``, which will only install standard
+  Alternatively, you can use ``environment-3.12-linux.yml`` or
+  ``environment-optional-3.12-linux.yml``, which will only install standard
   (and optional) packages without any additional developer tools.
 
-  A different Python version can be selected by replacing ``3.11`` by ``3.9``
-  or ``3.10`` in these commands.
+  A different Python version can be selected by replacing ``3.12`` with the 
+  desired version.
 
 - Bootstrap the source tree and install the build prerequisites and the Sage library::
 
@@ -137,7 +137,7 @@ After editing any Cython files, rebuild the Sage library using::
 
 In order to update the conda environment later, you can run::
 
-  $ mamba env update --file environment-3.11-linux.yml --name sage-dev
+  $ mamba env update --file environment-3.12-linux.yml --name sage-dev
 
 To build the documentation, use::
 
@@ -156,5 +156,5 @@ To build the documentation, use::
 
   You can update the conda lock files by running
   ``.github/workflows/conda-lock-update.py`` or by running
-  ``conda-lock --platform linux-64 --filename environment-3.11-linux.yml --lockfile environment-3.11-linux.lock``
+  ``conda-lock --platform linux-64 --filename environment-3.12-linux.yml --lockfile environment-3.12-linux.lock``
   manually.

src/doc/en/installation/launching.rst

@@ -67,9 +67,8 @@ Sage uses the following environment variables when it runs:
 
 - See
   https://docs.python.org/3/using/cmdline.html#environment-variables
-  for more variables used by Python (not an exhaustive list). With
-  Python 3.11 or later, a brief summary can also be obtained by
-  running `python3 --help-env`.
+  for more variables used by Python (not an exhaustive list). 
+  A brief summary can also be obtained by running `python3 --help-env`.
 
 Using a Jupyter Notebook remotely
 ---------------------------------

src/sage/all__sagemath_repl.py

@@ -100,12 +100,6 @@
                         message=r"Pickle, copy, and deepcopy support will be "
                                 r"removed from itertools in Python 3.14.")
 
-# triggered in Python 3.9 on Redhat-based distributions
-# https://github.com/sagemath/sage/issues/37863
-# https://github.com/networkx/networkx/issues/7101
-warnings.filterwarnings('ignore', category=RuntimeWarning,
-                        message="networkx backend defined more than once: nx-loopback")
-
 from sage.all__sagemath_objects import *
 from sage.all__sagemath_environment import *
 

src/sage/cpython/atexit.pyx

@@ -148,8 +148,6 @@ from cpython.ref cimport PyObject
 # Implement "_atexit_callbacks()" for each supported python version
 cdef extern from *:
     """
-    #if PY_VERSION_HEX >= 0x030a0000
-    /********** Python 3.10 **********/
     #define Py_BUILD_CORE
     #undef _PyGC_FINALIZED
     #include "internal/pycore_interp.h"
@@ -163,29 +161,6 @@ cdef extern from *:
         struct atexit_state state = interp->atexit;
         return state.callbacks;
     }
-    #else
-    /********** Python < 3.10 **********/
-    /* Internal structures defined in the CPython source in
-     * Modules/atexitmodule.c and subject to (but unlikely to) change.  Watch
-     * https://bugs.python.org/issue32082 for a request to (eventually)
-     * re-expose more of the atexit module's internals to Python
-     * typedef struct
-     */
-    typedef struct {
-        PyObject *func;
-        PyObject *args;
-        PyObject *kwargs;
-    } atexit_callback;
-    typedef struct {
-        atexit_callback **atexit_callbacks;
-        int ncallbacks;
-        int callback_len;
-    } atexitmodule_state;
-    static atexit_callback ** _atexit_callbacks(PyObject *self) {
-        atexitmodule_state *state = PyModule_GetState(self);
-        return state->atexit_callbacks;
-    }
-    #endif
     """
     ctypedef struct atexit_callback:
         PyObject* func

src/sage/cpython/cython_metaclass.h

@@ -8,13 +8,6 @@
 *                  http://www.gnu.org/licenses/
 *****************************************************************************/
 
-/* Compatibility for python 3.8, can be removed later */
-#if PY_VERSION_HEX < 0x030900A4 && !defined(Py_SET_TYPE)
-static inline void _Py_SET_TYPE(PyObject *ob, PyTypeObject *type)
-{ ob->ob_type = type; }
-#define Py_SET_TYPE(ob, type) _Py_SET_TYPE((PyObject*)(ob), type)
-#endif
-
 /* Tuple (None, None, None), initialized as needed */
 static PyObject* NoneNoneNone;
 
@@ -52,15 +45,13 @@ static CYTHON_INLINE int Sage_PyType_Ready(PyTypeObject* t)
     if (r < 0)
         return r;
 
-#if PY_VERSION_HEX >= 0x03050000
     // Cython 3 sets Py_TPFLAGS_HEAPTYPE before calling PyType_Ready,
     // and resets just after the call. We need to reset it earlier,
     // since otherwise the call to metaclass.__init__ below may have
     // illegal memory accesses.
     // See also:
     // https://github.com/cython/cython/issues/3603
     t->tp_flags &= ~Py_TPFLAGS_HEAPTYPE;
-#endif
 
     /* Set or get metaclass (the type of t) */
     PyTypeObject* metaclass;

src/sage/cpython/debug.pyx

@@ -19,9 +19,6 @@ cdef extern from "Python.h":
     # Helper to get a pointer to an object's __dict__ slot, if any
     PyObject** _PyObject_GetDictPtr(obj)
 
-cdef extern from "debugimpl.c":
-    void _type_debug(PyTypeObject*)
-
 from sage.cpython.getattr cimport AttributeErrorMessage
 
 
@@ -303,5 +300,3 @@ def type_debug(cls):
     """
     if not isinstance(cls, type):
         raise TypeError(f"{cls!r} is not a type")
-
-    _type_debug(<PyTypeObject*>cls)

src/sage/cpython/debugimpl.c

@@ -2,12 +2,14 @@
 #include <stdbool.h>
 
 #if PY_VERSION_HEX >= 0x030C00A5
+// For Python 3.12 compatibility
 #define ob_digit(o)  (((PyLongObject*)o)->long_value.ob_digit)
 #else
 #define ob_digit(o)  (((PyLongObject*)o)->ob_digit)
 #endif
 
 #if PY_VERSION_HEX >= 0x030C00A7
+// For Python 3.12 compatibility
 // taken from cpython:Include/internal/pycore_long.h @ 3.12
 
 /* Long value tag bits:
@@ -87,12 +89,7 @@ _PyLong_DigitCount(const PyLongObject *op)
 static inline void
 _PyLong_SetSignAndDigitCount(PyLongObject *op, int sign, Py_ssize_t size)
 {
-#if (PY_MAJOR_VERSION == 3) && (PY_MINOR_VERSION < 9)
-// The function Py_SET_SIZE is defined starting with python 3.9.
-    Py_SIZE(op) = size;
-#else
     Py_SET_SIZE(op, sign < 0 ? -size : size);
-#endif
 }
 
 #endif

src/sage/cpython/pycore_long.h

@@ -1082,7 +1082,7 @@ def compile_and_execute(self, example, compiler, globs):
             False
             sage: doctests, extras = FDS.create_doctests(globs)
             sage: ex0 = doctests[0].examples[0]
-            sage: flags = 32768 if sys.version_info.minor < 8 else 524288
+            sage: flags = 524288
             sage: def compiler(ex):
             ....:     return compile(ex.source, '<doctest sage.doctest.forker[0]>',
             ....:                    'single', flags, 1)

src/sage/doctest/forker.py

@@ -32,14 +32,6 @@ from sage.cpython.pycore_long cimport (ob_digit, _PyLong_IsNegative,
 from sage.libs.gmp.mpz cimport *
 
 cdef extern from *:
-    """
-    /* Compatibility for python 3.8, can be removed later */
-    #if PY_VERSION_HEX < 0x030900A4 && !defined(Py_SET_SIZE)
-    static inline void _Py_SET_SIZE(PyVarObject *ob, Py_ssize_t size)
-    { ob->ob_size = size; }
-    #define Py_SET_SIZE(ob, size) _Py_SET_SIZE((PyVarObject*)(ob), size)
-    #endif
-    """
     void Py_SET_SIZE(object, Py_ssize_t)
     int hash_bits """
         #ifdef _PyHASH_BITS

src/sage/libs/gmp/pylong.pyx

@@ -44,18 +44,13 @@ def reduce_code(co):
         raise ValueError("Cannot pickle code objects from closures")
 
     co_args = (co.co_argcount,)
-    if sys.version_info.minor >= 8:
-        co_args += (co.co_posonlyargcount,)
+    co_args += (co.co_posonlyargcount,)
     co_args += (co.co_kwonlyargcount, co.co_nlocals,
                 co.co_stacksize, co.co_flags, co.co_code,
                 co.co_consts, co.co_names, co.co_varnames, co.co_filename,
                 co.co_name)
-    if sys.version_info.minor >= 11:
-        co_args += (co.co_qualname, co.co_firstlineno,
-                    co.co_linetable, co.co_exceptiontable)
-    else:
-        co_args += (co.co_firstlineno, co.co_lnotab)
-
+    co_args += (co.co_qualname, co.co_firstlineno,
+                co.co_linetable, co.co_exceptiontable)
     return (code_ctor, co_args)
 
 

src/sage/misc/fpickle.pyx

@@ -8,14 +8,8 @@
 static CYTHON_INLINE void inherit_comparison(PyTypeObject* dst, const PyTypeObject* src)
 {
     /* Do nothing if "dst" already has comparison defined */
-#if (PY_MAJOR_VERSION < 3)
-    if (dst->tp_compare) return;
-#endif
     if (dst->tp_richcompare) return;
 
     /* Copy comparison method(s) */
-#if (PY_MAJOR_VERSION < 3)
-    dst->tp_compare = src->tp_compare;
-#endif
     dst->tp_richcompare = src->tp_richcompare;
 }

src/sage/misc/inherit_comparison_impl.c

@@ -1969,28 +1969,6 @@ def get_doc(self) -> list[list[str]] | None:
         if isinstance(self.object, TypeVar):
             if self.object.__doc__ == TypeVar.__doc__:
                 return []
-        # ------------------------------------------------------------------
-        # This section is kept for compatibility with python 3.9
-        # see https://github.com/sagemath/sage/pull/38549#issuecomment-2327790930
-        if sys.version_info[:2] < (3, 10):
-            if inspect.isNewType(self.object) or isinstance(self.object, TypeVar):
-                parts = self.modname.strip('.').split('.')
-                orig_objpath = self.objpath
-                for i in range(len(parts)):
-                    new_modname = '.'.join(parts[:len(parts) - i])
-                    new_objpath = parts[len(parts) - i:] + orig_objpath
-                    try:
-                        analyzer = ModuleAnalyzer.for_module(new_modname)
-                        analyzer.analyze()
-                        key = ('', new_objpath[-1])
-                        comment = list(analyzer.attr_docs.get(key, []))
-                        if comment:
-                            self.objpath = new_objpath
-                            self.modname = new_modname
-                            return [comment]
-                    except PycodeError:
-                        pass
-        # ------------------------------------------------------------------
         if self.doc_as_attr:
             # Don't show the docstring of the class when it is an alias.
             if self.get_variable_comment():

src/sage_docbuild/ext/sage_autodoc.py

@@ -104,8 +104,7 @@ def finalize_options(self):
                         ('force', 'force')]
 
         # Python 3.5 now has a parallel option as well
-        if sys.version_info[:2] >= (3, 5):
-            inherit_opts.append(('parallel', 'parallel'))
+        inherit_opts.append(('parallel', 'parallel'))
 
         self.set_undefined_options('build_ext', *inherit_opts)
 

src/sage_setup/command/sage_build_cython.py

@@ -9,7 +9,7 @@ license_files = LICENSE.txt
 include(`setup_cfg_metadata.m4')dnl'
 
 [options]
-python_requires = >=3.9, <3.13
+python_requires = >=3.11, <3.13
 install_requires =
     SPKG_INSTALL_REQUIRES_six
 dnl From build/pkgs/sagelib/dependencies