Skip to content

Commit 75afadb

Browse files
author
Release Manager
committed
gh-37270: Allow python 3.12 and scipy 1.12 This is a minimal PR to allow building with python 3.12, given the circumstances surrounding #36181. I've tested this works with system python 3.12 by: ``` ./bootstrap ./configure --disable-doc --disable-editable --enable-system-site- packages env 'MAKE=make -j36' make ./sage -tp 36 --all ./sage -tp 36 --all --long ``` It only gave the expected failures in `src/sage/matroids/database_collections.py` from #37140. Since scipy 1.12 works ok after #37123 and it's just a one-liner to change the required version, I included it here. No attempt is made at upgrading anything in sage-the-distro. ### 📝 Checklist - [x] The title is concise, informative, and self-explanatory. - [x] The description explains in detail what this PR is about. - [x] I have linked a relevant issue or discussion. EDIT: rebased on top of #36983 to address reviewer suggestion. URL: #37270 Reported by: Gonzalo Tornaría Reviewer(s): Aliaksei Urbanski, Gonzalo Tornaría, Tobias Diez
2 parents d3deb28 + cbde6e7 commit 75afadb

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

build/pkgs/python3/SPKG.rst

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ By default, Sage will try to use system's ``python3`` to set up a virtual
88
environment, a.k.a. `venv <https://docs.python.org/3.10/library/venv.html>`_
99
rather than building a Python 3 installation from scratch.
1010

11-
Sage will accept versions 3.9.x to 3.11.x.
11+
Sage will accept versions 3.9.x to 3.12.x.
1212

1313
You can also use ``--with-python=/path/to/python3_binary`` to tell Sage to use
1414
``/path/to/python3_binary`` to set up the venv. Note that setting up the venv requires

build/pkgs/python3/spkg-configure.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ SAGE_SPKG_CONFIGURE([python3], [
22
m4_pushdef([MIN_VERSION], [3.9.0])
33
m4_pushdef([MIN_NONDEPRECATED_VERSION], [3.9.0])
44
m4_pushdef([LT_STABLE_VERSION], [3.12.0])
5-
m4_pushdef([LT_VERSION], [3.12.0])
5+
m4_pushdef([LT_VERSION], [3.13.0])
66
AC_ARG_WITH([python],
77
[AS_HELP_STRING([--with-python=PYTHON3],
88
[Python 3 executable to use for the Sage venv; default: python3])])

build/pkgs/scipy/install-requires.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,4 +4,4 @@
44
# deprecations cannot be introduced in micro releases.
55
# SciPy devs wait "at least 6 months", "in practice two (minor) releases"
66
# from deprecation to removal of a feature.
7-
scipy >=1.5, <1.12
7+
scipy >=1.5

m4/pyproject_toml_metadata.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,4 +17,4 @@ classifiers = [
1717
"Topic :: Scientific/Engineering :: Mathematics",
1818
]
1919
urls = {Homepage = "https://www.sagemath.org"}
20-
requires-python = ">=3.9, <3.12"
20+
requires-python = ">=3.9, <3.13"

pkgs/sage-setup/pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ classifiers = [
2222
"Topic :: Scientific/Engineering :: Mathematics",
2323
]
2424
urls = {Homepage = "https://www.sagemath.org"}
25-
requires-python = ">=3.9, <3.12"
25+
requires-python = ">=3.9, <3.13"
2626
dependencies = []
2727
dynamic = ["version"]
2828

src/setup.cfg.m4

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ license_files = LICENSE.txt
99
include(`setup_cfg_metadata.m4')dnl'
1010

1111
[options]
12-
python_requires = >=3.9, <3.12
12+
python_requires = >=3.9, <3.13
1313
install_requires =
1414
SPKG_INSTALL_REQUIRES_sage_conf
1515
SPKG_INSTALL_REQUIRES_six

0 commit comments

Comments
 (0)