sagemath · mkoeppe · Oct 20, 2023 · Oct 25, 2023 · Oct 28, 2023 · Oct 28, 2023
diff --git a/.github/workflows/ci-linux-incremental.yml b/.github/workflows/ci-linux-incremental.yml
@@ -92,6 +92,7 @@ jobs:
          "debian-bookworm",
          "fedora-30",
          "fedora-38",
+         "fedora-39",
          "gentoo-python3.11",
          "debian-bullseye-i386"]
       tox_packages_factors: >-

diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -29,6 +29,7 @@ on:
            "debian-bullseye",
            "debian-bookworm",
            "debian-trixie",
+           "debian-trixie-python3.12",
            "debian-sid",
            "linuxmint-20.1",
            "linuxmint-20.2",
@@ -46,6 +47,7 @@ on:
            "fedora-36",
            "fedora-37",
            "fedora-38",
+           "fedora-38-python3.12",
            "fedora-39",
            "fedora-40",
            "centos-7-devtoolset-gcc_11",
@@ -59,8 +61,10 @@ on:
            "archlinux-latest",
            "opensuse-15.5-gcc_11-python3.11",
            "opensuse-tumbleweed-python3.10",
-           "opensuse-tumbleweed",
+           "opensuse-tumbleweed-python3.11",
+           "opensuse-tumbleweed-python3.12",
            "conda-forge-python3.11",
+           "conda-forge",
            "ubuntu-bionic-gcc_8-i386",
            "debian-bullseye-i386",
           ]

diff --git a/.gitignore b/.gitignore
@@ -193,6 +193,7 @@ build/bin/sage-build-env-config
 /pkgs/*/*.egg-info
 /pkgs/*/.tox
 
+/pkgs/sage-conf/pyproject.toml
 /pkgs/sage-conf_pypi/sage_root/config.log
 /pkgs/sage-conf_pypi/sage_root/config.status
 /pkgs/sage-conf_pypi/sage_root/local/

diff --git a/build/pkgs/python3/SPKG.rst b/build/pkgs/python3/SPKG.rst
@@ -15,6 +15,9 @@ You can also use ``--with-python=/path/to/python3_binary`` to tell Sage to use
 a number of Python modules to be available within the Python in question. Currently,
 as of Sage 10.3, these modules are as follows: ``sqlite3``, ``ctypes``, ``math``,
 ``hashlib``, ``socket``, ``zlib``, ``ssl``, ``ensurepip``.
+For Python >= 3.12, also ``setuptools`` is required; for older Python versions,
+``distutils.core`` is required. These modules will be checked for by the ``configure``
+script.
 
 Use the ``configure`` option ``--without-system-python3`` if you want Python 3
 built from scratch.

diff --git a/build/pkgs/python3/checksums.ini b/build/pkgs/python3/checksums.ini
@@ -1,5 +1,5 @@
 tarball=Python-VERSION.tar.xz
-sha1=89ee31611b73dc0c32c178d15aa208734b462c5a
-md5=4efe92adf28875c77d3b9b2e8d3bc44a
-cksum=2916176597
+sha1=040eac171c17062253042f7faafea830b03bf07b
+md5=e7c178b97bf8f7ccd677b94d614f7b3c
+cksum=271323389
 upstream_url=https://www.python.org/ftp/python/VERSION/Python-VERSION.tar.xz
diff --git a/build/pkgs/python3/distros/fedora.txt b/build/pkgs/python3/distros/fedora.txt
@@ -1,2 +1,2 @@
 python3-devel
-python-setuptools
+python3-setuptools
diff --git a/build/pkgs/python3/package-version.txt b/build/pkgs/python3/package-version.txt
@@ -1 +1 @@
-3.11.1
+3.12.2
diff --git a/build/pkgs/python3/patches/0001-bpo-22699-Allow-compiling-on-debian-ubuntu-with-a-di.patch b/build/pkgs/python3/patches/0001-bpo-22699-Allow-compiling-on-debian-ubuntu-with-a-di.patch
diff --git a/build/pkgs/python3/patches/2.7.3-dylib.patch b/build/pkgs/python3/patches/2.7.3-dylib.patch
diff --git a/build/pkgs/python3/patches/3.2.6-no-enable-new-dtags.patch b/build/pkgs/python3/patches/3.2.6-no-enable-new-dtags.patch
diff --git a/build/pkgs/python3/patches/linux_linking_issue_25229.patch b/build/pkgs/python3/patches/linux_linking_issue_25229.patch
diff --git a/build/pkgs/python3/spkg-configure.m4 b/build/pkgs/python3/spkg-configure.m4
@@ -1,7 +1,7 @@
 SAGE_SPKG_CONFIGURE([python3], [
    m4_pushdef([MIN_VERSION],               [3.9.0])
    m4_pushdef([MIN_NONDEPRECATED_VERSION], [3.9.0])
-   m4_pushdef([LT_STABLE_VERSION],         [3.12.0])
+   m4_pushdef([LT_STABLE_VERSION],         [3.13.0])
    m4_pushdef([LT_VERSION],                [3.13.0])
    AC_ARG_WITH([python],
                [AS_HELP_STRING([--with-python=PYTHON3],

diff --git a/build/pkgs/sage_conf/bootstrap b/build/pkgs/sage_conf/bootstrap
@@ -0,0 +1 @@
+../sagelib/bootstrap
diff --git a/build/pkgs/sage_conf/dependencies b/build/pkgs/sage_conf/dependencies
@@ -1 +1 @@
- $(SAGE_ROOT)/pkgs/sage-conf/_sage_conf/_conf.py $(SAGE_ROOT)/pkgs/sage-conf/setup.cfg $(SAGE_ROOT)/pkgs/sage-conf/bin/sage-env-config | $(PYTHON_TOOLCHAIN) $(PYTHON)
+ $(SAGE_ROOT)/pkgs/sage-conf/_sage_conf/_conf.py $(SAGE_ROOT)/pkgs/sage-conf/pyproject.toml $(SAGE_ROOT)/pkgs/sage-conf/bin/sage-env-config | $(PYTHON_TOOLCHAIN) $(PYTHON)
diff --git a/build/pkgs/sage_docbuild/bootstrap b/build/pkgs/sage_docbuild/bootstrap
@@ -0,0 +1 @@
+../sagelib/bootstrap
diff --git a/build/pkgs/sage_setup/bootstrap b/build/pkgs/sage_setup/bootstrap
@@ -0,0 +1 @@
+../sagelib/bootstrap
diff --git a/build/pkgs/sage_sws2rst/bootstrap b/build/pkgs/sage_sws2rst/bootstrap
@@ -0,0 +1 @@
+../sagelib/bootstrap
diff --git a/build/pkgs/setuptools/distros/fedora.txt b/build/pkgs/setuptools/distros/fedora.txt
@@ -1 +1 @@
-python-setuptools
+python3-setuptools
diff --git a/m4/pyproject_toml_metadata.m4 b/m4/pyproject_toml_metadata.m4
@@ -13,6 +13,7 @@ classifiers = [
     "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",
 ]

diff --git a/pkgs/sage-conf/.gitignore b/pkgs/sage-conf/.gitignore
@@ -1,4 +1,6 @@
 /_sage_conf/_conf.py
+/setup.cfg
+/pyproject.toml
 /build
 /dist
 /*.egg-info

diff --git a/pkgs/sage-conf/pyproject.toml b/pkgs/sage-conf/pyproject.toml
diff --git a/pkgs/sage-setup/pyproject.toml → pkgs/sage-conf/pyproject.toml.m4 b/pkgs/sage-setup/pyproject.toml → pkgs/sage-conf/pyproject.toml.m4
@@ -1,11 +1,17 @@
+include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
 [build-system]
-requires = ["setuptools>=61.2"]
+requires = [
+    SPKG_INSTALL_REQUIRES_setuptools
+]
 build-backend = "setuptools.build_meta"
 
 [project]
-name = "sage-setup"
-description = "Sage: Open Source Mathematics Software: Build system of the Sage library"
-license = {text = "GNU General Public License (GPL) v2 or later"}
+name = "sage-conf"
+description = "Sage: Open Source Mathematics Software: Configuration module for the SageMath library"
+readme = "README.rst"
+dnl Not including the standard metadata from pyproject_toml_metadata.m4
+dnl because sage-conf is GPL v3+.
+license = {text = "GNU General Public License (GPL) v3 or later"}
 authors = [{name = "The Sage Developers", email = "[email protected]"}]
 classifiers = [
     "Development Status :: 6 - Mature",
@@ -18,29 +24,21 @@ classifiers = [
     "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"
-dependencies = []
 dynamic = ["version"]
 
-[project.readme]
-file = "README.rst"
-content-type = "text/x-rst"
-
-[project.optional-dependencies]
-autogen = ["jinja2"]
+[project.scripts]
+sage-config = "sage_conf:_main"
 
 [tool.setuptools]
-packages = [
-    "sage_setup",
-    "sage_setup.autogen",
-    "sage_setup.autogen.interpreters",
-    "sage_setup.autogen.interpreters.specs",
-    "sage_setup.command",
-]
+packages = ["_sage_conf"]
+py-modules = ["sage_conf"]
+script-files = ["bin/sage-env-config"]
 include-package-data = false
 
 [tool.setuptools.dynamic]

diff --git a/pkgs/sage-conf/setup.cfg b/pkgs/sage-conf/setup.cfg
diff --git a/pkgs/sage-conf_conda/setup.cfg b/pkgs/sage-conf_conda/setup.cfg
diff --git a/pkgs/sage-conf_pypi/setup.cfg b/pkgs/sage-conf_pypi/setup.cfg
diff --git a/pkgs/sage-docbuild/pyproject.toml b/pkgs/sage-docbuild/pyproject.toml
diff --git a/pkgs/sage-docbuild/pyproject.toml.m4 b/pkgs/sage-docbuild/pyproject.toml.m4
@@ -0,0 +1,29 @@
+include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
+[build-system]
+requires = [
+    SPKG_INSTALL_REQUIRES_setuptools
+]
+build-backend = "setuptools.build_meta"
+
+[project]
+name = "sage-docbuild"
+description = "Sage: Open Source Mathematics Software: Build system of the Sage documentation"
+dependencies = [
+    SPKG_INSTALL_REQUIRES_sphinx
+]
+dynamic = ["version"]
+include(`pyproject_toml_metadata.m4')dnl'
+
+[project.readme]
+file = "README.rst"
+content-type = "text/x-rst"
+
+[tool.setuptools]
+packages = [
+    "sage_docbuild",
+    "sage_docbuild.ext",
+]
+include-package-data = false
+
+[tool.setuptools.dynamic]
+version = {file = ["VERSION.txt"]}
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		$(SAGE_ROOT)/pkgs/sage-conf/_sage_conf/_conf.py $(SAGE_ROOT)/pkgs/sage-conf/setup.cfg $(SAGE_ROOT)/pkgs/sage-conf/bin/sage-env-config \| $(PYTHON_TOOLCHAIN) $(PYTHON)
		$(SAGE_ROOT)/pkgs/sage-conf/_sage_conf/_conf.py $(SAGE_ROOT)/pkgs/sage-conf/pyproject.toml $(SAGE_ROOT)/pkgs/sage-conf/bin/sage-env-config \| $(PYTHON_TOOLCHAIN) $(PYTHON)