Skip to content

Commit 647ec81

Browse files
author
Release Manager
committed
gh-36983: Prepare python3 `spkg-configure.m4` for Python 3.12 (setuptools instead of distutils) <!-- ^^^^^ Please provide a concise, informative and self-explanatory title. Don't put issue numbers in there, do this in the PR body below. For example, instead of "Fixes #1234" use "Introduce new method to calculate 1+1" --> <!-- Describe your changes here in detail --> - Cherry-picked from #36181 This PR does not change what versions are accepted! To test with Python 3.12, still need to adjust the version bound set in `build/pkgs/python3/spkg-configure.m4`. <!-- Why is this change required? What problem does it solve? --> <!-- If this PR resolves an open issue, please link to it here. For example "Fixes #12345". --> <!-- If your change requires a documentation PR, please link it appropriately. --> ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> <!-- If your change requires a documentation PR, please link it appropriately --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> <!-- Feel free to remove irrelevant items. --> - [x] The title is concise, informative, and self-explanatory. - [ ] 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 accordingly. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on - #12345: short description why this is a dependency - #34567: ... --> - Depends on #36957 (merged here to resolve merge conflict) <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> URL: #36983 Reported by: Matthias Köppe Reviewer(s): Gonzalo Tornaría, Matthias Köppe
2 parents 20a6fde + 0e54d2c commit 647ec81

File tree

12 files changed

+36
-17
lines changed

12 files changed

+36
-17
lines changed
Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
11
python3.12
22
python3.12-dev
3-
python3.12-distutils
43
python3.12-venv

build/pkgs/python3/SPKG.rst

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,16 +8,15 @@ 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.10.x.
11+
Sage will accept versions 3.9.x to 3.11.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
1515
a number of Python modules to be available within the Python in question. Currently,
16-
as of Sage 9.7, these modules are as follows: ``sqlite3``, ``ctypes``, ``math``,
17-
``hashlib``, ``socket``, ``zlib``, ``distutils.core``, ``ssl`` -
18-
they will be checked for by the ``configure`` script.
16+
as of Sage 10.3, these modules are as follows: ``sqlite3``, ``ctypes``, ``math``,
17+
``hashlib``, ``socket``, ``zlib``, ``ssl``, ``ensurepip``.
1918

20-
Use the ``configure`` option ``--without-system-python3`` in case you want Python 3
19+
Use the ``configure`` option ``--without-system-python3`` if you want Python 3
2120
built from scratch.
2221

2322

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
python3-dev
2+
py3-setuptools
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
python3
22
libpython3-dev
3-
python3-distutils
3+
python3-setuptools
44
python3-venv
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
python3-devel
2+
python-setuptools
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
lang/python
2+
devel/py-setuptools
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
11
# This installs /usr/local/bin/python3 -> python3.9
22
python3
3+
python-setuptools
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
python310
2+
py-setuptools
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
python3${PYTHON_MINOR}-devel
2+
python3${PYTHON_MINOR}-setuptools
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
python3-devel
2+
python3-setuptools

0 commit comments

Comments
 (0)