Skip to content

Commit 5f5e984

Browse files
author
Release Manager
committed
sagemathgh-39251: Require Python 3.11 or newer; remove outdated workarounds <!-- ^ Please provide a concise and informative title. --> <!-- ^ Don't put issue numbers in the title, do this in the PR description below. --> <!-- ^ For example, instead of "Fixes sagemath#12345" use "Introduce new method to calculate 1 + 2". --> <!-- v Describe your changes below in detail. --> <!-- v Why is this change required? What problem does it solve? --> <!-- v If this PR resolves an open issue, please link to it here. For example, "Fixes sagemath#12345". --> In line with Spec 0, we remove support for Python 3.9 and 3.10. Many outdated patches/workarounds for these older (or even older) Python versions are removed, but I cannot guarantee that I've found all obsolete ones. Nothing in sage-the-distro is touched. For next years cleaning job: - Search for `3.11`, `311`, `PY_VERSION`, `PY_MINOR_VERSION` and `sys.version_info` - Change version in `pyproject.toml` ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> - [ ] The title is concise and informative. - [ ] The description explains in detail what this PR is about. - [ ] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation and checked the documentation preview. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on. For example, --> <!-- - sagemath#12345: short description why this is a dependency --> <!-- - sagemath#34567: ... --> URL: sagemath#39251 Reported by: Tobias Diez Reviewer(s): Dima Pasechnik
2 parents e0e0d96 + 1884ebc commit 5f5e984

27 files changed

+48
-506
lines changed

‎.github/workflows/build.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ on:
1515
platform:
1616
description: 'Platform'
1717
required: true
18-
default: 'ubuntu-jammy-standard'
18+
default: 'ubuntu-noble-standard'
1919
docker_tag:
2020
description: 'Docker tag'
2121
required: true
@@ -68,8 +68,8 @@ concurrency:
6868

6969
env:
7070
# Adapted from docker.yml
71-
TOX_ENV: "docker-${{ github.event.inputs.platform || 'ubuntu-jammy-standard' }}-incremental"
72-
BUILD_IMAGE: "localhost:5000/${{ github.repository }}/sage-${{ github.event.inputs.platform || 'ubuntu-jammy-standard' }}-with-targets:ci"
71+
TOX_ENV: "docker-${{ github.event.inputs.platform || 'ubuntu-noble-standard' }}-incremental"
72+
BUILD_IMAGE: "localhost:5000/${{ github.repository }}/sage-${{ github.event.inputs.platform || 'ubuntu-noble-standard' }}-with-targets:ci"
7373
FROM_DOCKER_REPOSITORY: "ghcr.io/sagemath/sage/"
7474
FROM_DOCKER_TARGET: "with-targets"
7575
FROM_DOCKER_TAG: ${{ github.event.inputs.docker_tag || 'dev'}}

‎.github/workflows/dist.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,7 @@ jobs:
216216
#
217217
CIBW_ARCHS: ${{ matrix.arch }}
218218
# https://cibuildwheel.readthedocs.io/en/stable/options/#requires-python
219-
CIBW_PROJECT_REQUIRES_PYTHON: ">=3.9, <3.13"
219+
CIBW_PROJECT_REQUIRES_PYTHON: ">=3.11, <3.13"
220220
# Environment during wheel build
221221
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"
222222
# Use 'build', not 'pip wheel'

‎.github/workflows/doc-build-pdf.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ on:
99
platform:
1010
description: 'Platform'
1111
required: true
12-
default: 'ubuntu-jammy-standard'
12+
default: 'ubuntu-noble-standard'
1313
docker_tag:
1414
description: 'Docker tag'
1515
required: true
@@ -22,8 +22,8 @@ concurrency:
2222

2323
env:
2424
# Same as in build.yml
25-
TOX_ENV: "docker-${{ github.event.inputs.platform || 'ubuntu-jammy-standard' }}-incremental"
26-
BUILD_IMAGE: "localhost:5000/${{ github.repository }}/sage-${{ github.event.inputs.platform || 'ubuntu-jammy-standard' }}-with-targets:ci"
25+
TOX_ENV: "docker-${{ github.event.inputs.platform || 'ubuntu-noble-standard' }}-incremental"
26+
BUILD_IMAGE: "localhost:5000/${{ github.repository }}/sage-${{ github.event.inputs.platform || 'ubuntu-noble-standard' }}-with-targets:ci"
2727
FROM_DOCKER_REPOSITORY: "ghcr.io/sagemath/sage/"
2828
FROM_DOCKER_TARGET: "with-targets"
2929
FROM_DOCKER_TAG: ${{ github.event.inputs.docker_tag || 'dev'}}

‎.github/workflows/doc-build.yml

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ on:
2020
platform:
2121
description: 'Platform'
2222
required: true
23-
default: 'ubuntu-jammy-standard'
23+
default: 'ubuntu-noble-standard'
2424
docker_tag:
2525
description: 'Docker tag'
2626
required: true
@@ -33,8 +33,8 @@ concurrency:
3333

3434
env:
3535
# Same as in build.yml
36-
TOX_ENV: "docker-${{ github.event.inputs.platform || 'ubuntu-jammy-standard' }}-incremental"
37-
BUILD_IMAGE: "localhost:5000/${{ github.repository }}/sage-${{ github.event.inputs.platform || 'ubuntu-jammy-standard' }}-with-targets:ci"
36+
TOX_ENV: "docker-${{ github.event.inputs.platform || 'ubuntu-noble-standard' }}-incremental"
37+
BUILD_IMAGE: "localhost:5000/${{ github.repository }}/sage-${{ github.event.inputs.platform || 'ubuntu-noble-standard' }}-with-targets:ci"
3838
FROM_DOCKER_REPOSITORY: "ghcr.io/sagemath/sage/"
3939
FROM_DOCKER_TARGET: "with-targets"
4040
FROM_DOCKER_TAG: ${{ github.event.inputs.docker_tag || 'dev'}}

‎.github/workflows/pyright.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ concurrency:
1818
jobs:
1919
pyright:
2020
runs-on: ubuntu-latest
21-
container: ghcr.io/sagemath/sage/sage-ubuntu-jammy-standard-with-targets:dev
21+
container: ghcr.io/sagemath/sage/sage-ubuntu-noble-standard-with-targets:dev
2222
steps:
2323
- name: Checkout
2424
id: checkout

‎.gitignore

-1
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,6 @@ __pycache__/
158158
/src/sage/modular/arithgroup/farey_symbol.h
159159
# List of C and C++ files that are actual source files,
160160
# NOT generated by Cython. The same list appears in src/MANIFEST.in
161-
!/src/sage/cpython/debugimpl.c
162161
!/src/sage/graphs/base/boost_interface.cpp
163162
!/src/sage/graphs/cliquer/cl.c
164163
!/src/sage/graphs/graph_decompositions/sage_tdlib.cpp

‎README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ in the Installation Guide.
222222
more details.
223223

224224
- Python 3.4 or later, or Python 2.7, a full installation including
225-
`urllib`; but ideally version 3.9.x, 3.10.x, 3.11.x, 3.12.x, which
225+
`urllib`; but ideally version 3.11.x or later, which
226226
will avoid having to build Sage's own copy of Python 3.
227227
See [build/pkgs/python3/SPKG.rst](build/pkgs/python3/SPKG.rst)
228228
for more details.
@@ -557,11 +557,11 @@ SAGE_ROOT Root directory (create by git clone)
557557
│ │ ├── installed/
558558
│ │ │ Records of installed non-Python packages
559559
│ │ ├── scripts/ Scripts for uninstalling installed packages
560-
│ │ └── venv-python3.9 (SAGE_VENV)
560+
│ │ └── venv-python (SAGE_VENV)
561561
│ │ │ Installation hierarchy (virtual environment)
562562
│ │ │ for Python packages
563563
│ │ ├── bin/ Executables and installed scripts
564-
│ │ ├── lib/python3.9/site-packages/
564+
│ │ ├── lib/python/site-packages/
565565
│ │ │ Python modules/packages are installed here
566566
│ │ └── var/lib/sage/
567567
│ │ └── wheels/

‎pyproject.toml

+1-3
Original file line numberDiff line numberDiff line change
@@ -62,16 +62,14 @@ classifiers = [
6262
"Operating System :: POSIX",
6363
"Operating System :: MacOS :: MacOS X",
6464
"Programming Language :: Python :: 3 :: Only",
65-
"Programming Language :: Python :: 3.9",
66-
"Programming Language :: Python :: 3.10",
6765
"Programming Language :: Python :: 3.11",
6866
"Programming Language :: Python :: 3.12",
6967
"Programming Language :: Python :: 3.13",
7068
"Programming Language :: Python :: Implementation :: CPython",
7169
"Topic :: Scientific/Engineering :: Mathematics",
7270
]
7371
urls = {Homepage = "https://www.sagemath.org"}
74-
requires-python = ">=3.9, <3.14"
72+
requires-python = ">=3.11, <3.14"
7573

7674
[project.optional-dependencies]
7775
R = [

‎pyrightconfig.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"root": "src"
88
}
99
],
10-
"pythonVersion": "3.9",
10+
"pythonVersion": "3.11",
1111
"exclude": ["venv"],
1212
"venvPath": "./venv/",
1313
"venv": "./",

‎ruff.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# https://docs.astral.sh/ruff/configuration/#config-file-discovery
22

3-
# Assume Python 3.9
4-
target-version = "py39"
3+
# Python 3.11 is the minimum supported version
4+
target-version = "py311"
55

66
lint.select = [
77
"E", # pycodestyle errors - https://docs.astral.sh/ruff/rules/#error-e

‎src/MANIFEST.in

-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ global-exclude *.cpp
2323
# List of C and C++ files that are actual source files,
2424
# NOT generated by Cython. The same list appears in SAGE_ROOT/.gitignore
2525
#
26-
include sage/cpython/debugimpl.c
2726
include sage/graphs/base/boost_interface.cpp
2827
include sage/graphs/cliquer/cl.c
2928
include sage/libs/eclib/wrap.cpp

‎src/doc/en/developer/coding_in_python.rst

+11-26
Original file line numberDiff line numberDiff line change
@@ -12,17 +12,14 @@ Sage.
1212
Python language standard
1313
========================
1414

15-
Sage library code needs to be compatible with all versions of Python
16-
that Sage supports. The information regarding the supported versions
17-
can be found in the files ``build/pkgs/python3/spkg-configure.m4`` and
18-
``src/setup.cfg.m4``.
19-
20-
Python 3.9 is the oldest supported version. Hence,
21-
all language and library features that are available in Python 3.9 can
22-
be used; but features introduced in Python 3.10 cannot be used. If a
23-
feature is deprecated in a newer supported version, it must be ensured
24-
that deprecation warnings issued by Python do not lead to failures in
25-
doctests.
15+
Sage follows the time window-based support policy
16+
`SPEC 0 — Minimum Supported Dependencies <https://scientific-python.org/specs/spec-0000/>`_
17+
for Python versions.
18+
The current minimum supported Python version can be found in the
19+
``pyproject.toml`` file. Accordingly, only language and library features
20+
available in this version can be used. If a feature is deprecated in a newer
21+
supported version, it must be ensured that deprecation warnings issued by
22+
Python do not lead to failures in doctests.
2623

2724
Some key language and library features have been backported to older Python versions
2825
using one of two mechanisms:
@@ -34,21 +31,9 @@ using one of two mechanisms:
3431
of annotations). All Sage library code that uses type annotations
3532
should include this ``__future__`` import and follow PEP 563.
3633

37-
- Backport packages
38-
39-
- `importlib_metadata <../reference/spkg/importlib_metadata>`_
40-
(to be used in place of ``importlib.metadata``),
41-
- `importlib_resources <../reference/spkg/importlib_resources>`_
42-
(to be used in place of ``importlib.resources``),
43-
- `typing_extensions <../reference/spkg/typing_extensions>`_
44-
(to be used in place of ``typing``).
45-
46-
The Sage library declares these packages as dependencies and ensures that
47-
versions that provide features of Python 3.11 are available.
48-
49-
Meta :issue:`29756` keeps track of newer Python features and serves
50-
as a starting point for discussions on how to make use of them in the
51-
Sage library.
34+
- The `typing_extensions <../reference/spkg/typing_extensions>`_ package
35+
is used to backport features from newer versions of the ``typing`` module.
36+
The Sage library declares this package as a dependency.
5237

5338

5439
Design

‎src/doc/en/installation/conda.rst

+9-9
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ Create a new conda environment containing SageMath, either with ``mamba`` or ``c
5050
5151
$ conda create -n sage sage python=X
5252
53-
where ``X`` is version of Python, e.g. ``3.9``.
53+
where ``X`` is version of Python, e.g. ``3.12``.
5454

5555
To use Sage from there,
5656

@@ -86,22 +86,22 @@ Here we assume that you are using a git checkout.
8686

8787
.. code-block:: shell
8888
89-
$ mamba env create --file environment-3.11-linux.yml --name sage-dev
89+
$ mamba env create --file environment-3.12-linux.yml --name sage-dev
9090
$ conda activate sage-dev
9191
9292
.. tab:: conda
9393

9494
.. code-block:: shell
9595
96-
$ conda env create --file environment-3.11-linux.yml --name sage-dev
96+
$ conda env create --file environment-3.12-linux.yml --name sage-dev
9797
$ conda activate sage-dev
9898
99-
Alternatively, you can use ``environment-3.11-linux.yml`` or
100-
``environment-optional-3.11-linux.yml``, which will only install standard
99+
Alternatively, you can use ``environment-3.12-linux.yml`` or
100+
``environment-optional-3.12-linux.yml``, which will only install standard
101101
(and optional) packages without any additional developer tools.
102102

103-
A different Python version can be selected by replacing ``3.11`` by ``3.9``
104-
or ``3.10`` in these commands.
103+
A different Python version can be selected by replacing ``3.12`` with the
104+
desired version.
105105

106106
- Bootstrap the source tree and install the build prerequisites and the Sage library::
107107

@@ -137,7 +137,7 @@ After editing any Cython files, rebuild the Sage library using::
137137

138138
In order to update the conda environment later, you can run::
139139

140-
$ mamba env update --file environment-3.11-linux.yml --name sage-dev
140+
$ mamba env update --file environment-3.12-linux.yml --name sage-dev
141141

142142
To build the documentation, use::
143143

@@ -156,5 +156,5 @@ To build the documentation, use::
156156

157157
You can update the conda lock files by running
158158
``.github/workflows/conda-lock-update.py`` or by running
159-
``conda-lock --platform linux-64 --filename environment-3.11-linux.yml --lockfile environment-3.11-linux.lock``
159+
``conda-lock --platform linux-64 --filename environment-3.12-linux.yml --lockfile environment-3.12-linux.lock``
160160
manually.

‎src/doc/en/installation/launching.rst

+2-3
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,8 @@ Sage uses the following environment variables when it runs:
6767

6868
- See
6969
https://docs.python.org/3/using/cmdline.html#environment-variables
70-
for more variables used by Python (not an exhaustive list). With
71-
Python 3.11 or later, a brief summary can also be obtained by
72-
running `python3 --help-env`.
70+
for more variables used by Python (not an exhaustive list).
71+
A brief summary can also be obtained by running `python3 --help-env`.
7372

7473
Using a Jupyter Notebook remotely
7574
---------------------------------

‎src/sage/all__sagemath_repl.py

-6
Original file line numberDiff line numberDiff line change
@@ -100,12 +100,6 @@
100100
message=r"Pickle, copy, and deepcopy support will be "
101101
r"removed from itertools in Python 3.14.")
102102

103-
# triggered in Python 3.9 on Redhat-based distributions
104-
# https://github.com/sagemath/sage/issues/37863
105-
# https://github.com/networkx/networkx/issues/7101
106-
warnings.filterwarnings('ignore', category=RuntimeWarning,
107-
message="networkx backend defined more than once: nx-loopback")
108-
109103
from sage.all__sagemath_objects import *
110104
from sage.all__sagemath_environment import *
111105

‎src/sage/cpython/atexit.pyx

-25
Original file line numberDiff line numberDiff line change
@@ -148,8 +148,6 @@ from cpython.ref cimport PyObject
148148
# Implement "_atexit_callbacks()" for each supported python version
149149
cdef extern from *:
150150
"""
151-
#if PY_VERSION_HEX >= 0x030a0000
152-
/********** Python 3.10 **********/
153151
#define Py_BUILD_CORE
154152
#undef _PyGC_FINALIZED
155153
#include "internal/pycore_interp.h"
@@ -163,29 +161,6 @@ cdef extern from *:
163161
struct atexit_state state = interp->atexit;
164162
return state.callbacks;
165163
}
166-
#else
167-
/********** Python < 3.10 **********/
168-
/* Internal structures defined in the CPython source in
169-
* Modules/atexitmodule.c and subject to (but unlikely to) change. Watch
170-
* https://bugs.python.org/issue32082 for a request to (eventually)
171-
* re-expose more of the atexit module's internals to Python
172-
* typedef struct
173-
*/
174-
typedef struct {
175-
PyObject *func;
176-
PyObject *args;
177-
PyObject *kwargs;
178-
} atexit_callback;
179-
typedef struct {
180-
atexit_callback **atexit_callbacks;
181-
int ncallbacks;
182-
int callback_len;
183-
} atexitmodule_state;
184-
static atexit_callback ** _atexit_callbacks(PyObject *self) {
185-
atexitmodule_state *state = PyModule_GetState(self);
186-
return state->atexit_callbacks;
187-
}
188-
#endif
189164
"""
190165
ctypedef struct atexit_callback:
191166
PyObject* func

‎src/sage/cpython/cython_metaclass.h

-9
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,6 @@
88
* http://www.gnu.org/licenses/
99
*****************************************************************************/
1010

11-
/* Compatibility for python 3.8, can be removed later */
12-
#if PY_VERSION_HEX < 0x030900A4 && !defined(Py_SET_TYPE)
13-
static inline void _Py_SET_TYPE(PyObject *ob, PyTypeObject *type)
14-
{ ob->ob_type = type; }
15-
#define Py_SET_TYPE(ob, type) _Py_SET_TYPE((PyObject*)(ob), type)
16-
#endif
17-
1811
/* Tuple (None, None, None), initialized as needed */
1912
static PyObject* NoneNoneNone;
2013

@@ -52,15 +45,13 @@ static CYTHON_INLINE int Sage_PyType_Ready(PyTypeObject* t)
5245
if (r < 0)
5346
return r;
5447

55-
#if PY_VERSION_HEX >= 0x03050000
5648
// Cython 3 sets Py_TPFLAGS_HEAPTYPE before calling PyType_Ready,
5749
// and resets just after the call. We need to reset it earlier,
5850
// since otherwise the call to metaclass.__init__ below may have
5951
// illegal memory accesses.
6052
// See also:
6153
// https://github.com/cython/cython/issues/3603
6254
t->tp_flags &= ~Py_TPFLAGS_HEAPTYPE;
63-
#endif
6455

6556
/* Set or get metaclass (the type of t) */
6657
PyTypeObject* metaclass;

‎src/sage/cpython/debug.pyx

-5
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,6 @@ cdef extern from "Python.h":
1919
# Helper to get a pointer to an object's __dict__ slot, if any
2020
PyObject** _PyObject_GetDictPtr(obj)
2121

22-
cdef extern from "debugimpl.c":
23-
void _type_debug(PyTypeObject*)
24-
2522
from sage.cpython.getattr cimport AttributeErrorMessage
2623

2724

@@ -303,5 +300,3 @@ def type_debug(cls):
303300
"""
304301
if not isinstance(cls, type):
305302
raise TypeError(f"{cls!r} is not a type")
306-
307-
_type_debug(<PyTypeObject*>cls)

0 commit comments

Comments
 (0)