From 1cc10cf0e04b682353dd9e97b5fdc450d81c5a2b Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Thu, 25 Sep 2025 10:33:05 +0800 Subject: [PATCH 1/5] Remove sage_conf from sage-the-distro --- build/make/Makefile.in | 1 - build/pkgs/sage_conf/SPKG.rst | 1 - build/pkgs/sage_conf/dependencies | 1 - build/pkgs/sage_conf/package-version.txt | 1 - build/pkgs/sage_conf/spkg-install.in | 1 - build/pkgs/sage_conf/spkg-src | 22 ------------------- build/pkgs/sage_conf/src | 1 - build/pkgs/sage_conf/type | 1 - build/pkgs/sage_conf/version_requirements.txt | 2 -- 9 files changed, 31 deletions(-) delete mode 120000 build/pkgs/sage_conf/SPKG.rst delete mode 100644 build/pkgs/sage_conf/dependencies delete mode 120000 build/pkgs/sage_conf/package-version.txt delete mode 120000 build/pkgs/sage_conf/spkg-install.in delete mode 100755 build/pkgs/sage_conf/spkg-src delete mode 120000 build/pkgs/sage_conf/src delete mode 100644 build/pkgs/sage_conf/type delete mode 100644 build/pkgs/sage_conf/version_requirements.txt diff --git a/build/make/Makefile.in b/build/make/Makefile.in index db7394b44cc..54633fbf78d 100644 --- a/build/make/Makefile.in +++ b/build/make/Makefile.in @@ -141,7 +141,6 @@ PYPI_WHEEL_PACKAGES = \ # sage_docbuild is here, not in PYPI_WHEEL_PACKAGES, because it depends on sagelib WHEEL_PACKAGES = $(PYPI_WHEEL_PACKAGES) \ - sage_conf \ sagelib \ sage_docbuild diff --git a/build/pkgs/sage_conf/SPKG.rst b/build/pkgs/sage_conf/SPKG.rst deleted file mode 120000 index b4545b4bda6..00000000000 --- a/build/pkgs/sage_conf/SPKG.rst +++ /dev/null @@ -1 +0,0 @@ -src/README.rst \ No newline at end of file diff --git a/build/pkgs/sage_conf/dependencies b/build/pkgs/sage_conf/dependencies deleted file mode 100644 index f2bd00aaf0d..00000000000 --- a/build/pkgs/sage_conf/dependencies +++ /dev/null @@ -1 +0,0 @@ - $(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) diff --git a/build/pkgs/sage_conf/package-version.txt b/build/pkgs/sage_conf/package-version.txt deleted file mode 120000 index c4fcb84c1a7..00000000000 --- a/build/pkgs/sage_conf/package-version.txt +++ /dev/null @@ -1 +0,0 @@ -../../../VERSION.txt \ No newline at end of file diff --git a/build/pkgs/sage_conf/spkg-install.in b/build/pkgs/sage_conf/spkg-install.in deleted file mode 120000 index 428e161a850..00000000000 --- a/build/pkgs/sage_conf/spkg-install.in +++ /dev/null @@ -1 +0,0 @@ -../sage_setup/spkg-install.in \ No newline at end of file diff --git a/build/pkgs/sage_conf/spkg-src b/build/pkgs/sage_conf/spkg-src deleted file mode 100755 index c2fa51df092..00000000000 --- a/build/pkgs/sage_conf/spkg-src +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env bash -# -# Script to prepare an sdist tarball for sage_conf -# This script is not used during build. -# -# HOW TO MAKE THE TARBALL: -# ./sage --sh build/pkgs/sage_conf/spkg-src - -if [ -z "$SAGE_ROOT" ] ; then - echo >&2 "Error - SAGE_ROOT undefined ... exiting" - echo >&2 "Maybe run 'sage -sh'?" - exit 1 -fi - -# Exit on failure -set -e - -cd pkgs/sage-conf_pypi -# Get rid of old *.egg-info/SOURCES.txt -rm -Rf *.egg-info - -python3 -m build --sdist --no-isolation --skip-dependency-check --outdir "$SAGE_DISTFILES" diff --git a/build/pkgs/sage_conf/src b/build/pkgs/sage_conf/src deleted file mode 120000 index 83ff1c1b7d5..00000000000 --- a/build/pkgs/sage_conf/src +++ /dev/null @@ -1 +0,0 @@ -../../../pkgs/sage-conf \ No newline at end of file diff --git a/build/pkgs/sage_conf/type b/build/pkgs/sage_conf/type deleted file mode 100644 index a6a7b9cd726..00000000000 --- a/build/pkgs/sage_conf/type +++ /dev/null @@ -1 +0,0 @@ -standard diff --git a/build/pkgs/sage_conf/version_requirements.txt b/build/pkgs/sage_conf/version_requirements.txt deleted file mode 100644 index fe78e30bea5..00000000000 --- a/build/pkgs/sage_conf/version_requirements.txt +++ /dev/null @@ -1,2 +0,0 @@ -# This file is updated on every release by the update-version script -sage-conf ~= 10.8b3 From 8dbc1ea0430fe7a9785218dd2f8d735b1ea010e7 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Thu, 25 Sep 2025 10:36:05 +0800 Subject: [PATCH 2/5] Make sure to run the ci-distro to catch similar issues in the future --- .github/workflows/ci-distro.yml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/.github/workflows/ci-distro.yml b/.github/workflows/ci-distro.yml index c7957050fa6..f250ab2427d 100644 --- a/.github/workflows/ci-distro.yml +++ b/.github/workflows/ci-distro.yml @@ -19,13 +19,8 @@ on: paths: - '.github/workflows/ci-distro.yml' - 'build/pkgs/**' + - 'build/make/**' - 'configure.ac' - - '!build/pkgs/sage_conf/**' - - '!build/pkgs/sage_docbuild/**' - - '!build/pkgs/sage_setup/**' - - '!build/pkgs/sage_sws2rst/**' - - '!build/pkgs/sagelib/**' - - '!build/pkgs/sagemath_*/**' push: tags: - '*' From 86f0f207058dd716aae82554347d8fc4119afa9a Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Thu, 25 Sep 2025 10:59:20 +0800 Subject: [PATCH 3/5] Fix bootstrap --- build/pkgs/sagemath_bliss/dependencies | 2 +- pkgs/sagemath-bliss/pyproject.toml.m4 | 1 - pkgs/sagemath-environment/pyproject.toml.m4 | 1 - 3 files changed, 1 insertion(+), 3 deletions(-) diff --git a/build/pkgs/sagemath_bliss/dependencies b/build/pkgs/sagemath_bliss/dependencies index a7915e316b9..8e5c304aae9 100644 --- a/build/pkgs/sagemath_bliss/dependencies +++ b/build/pkgs/sagemath_bliss/dependencies @@ -1 +1 @@ - bliss cysignals | $(PYTHON_TOOLCHAIN) sage_setup sage_conf sagemath_environment cython pkgconfig $(PYTHON) + bliss cysignals | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig $(PYTHON) diff --git a/pkgs/sagemath-bliss/pyproject.toml.m4 b/pkgs/sagemath-bliss/pyproject.toml.m4 index 40bfebf2489..7f5321551f3 100644 --- a/pkgs/sagemath-bliss/pyproject.toml.m4 +++ b/pkgs/sagemath-bliss/pyproject.toml.m4 @@ -3,7 +3,6 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*- # Minimum requirements for the build system to execute. requires = [ SPKG_INSTALL_REQUIRES_setuptools - SPKG_INSTALL_REQUIRES_sage_conf SPKG_INSTALL_REQUIRES_sage_setup SPKG_INSTALL_REQUIRES_sagemath_environment SPKG_INSTALL_REQUIRES_cython diff --git a/pkgs/sagemath-environment/pyproject.toml.m4 b/pkgs/sagemath-environment/pyproject.toml.m4 index 5fc7ca4711f..bbfbb016377 100644 --- a/pkgs/sagemath-environment/pyproject.toml.m4 +++ b/pkgs/sagemath-environment/pyproject.toml.m4 @@ -15,7 +15,6 @@ dynamic = ["version"] include(`pyproject_toml_metadata.m4')dnl' [project.optional-dependencies] -conf = [SPKG_INSTALL_REQUIRES_sage_conf] # sage.env can optionally use sage_conf docbuild = [SPKG_INSTALL_REQUIRES_sage_docbuild] # For "sage --docbuild" sage = [SPKG_INSTALL_REQUIRES_sagelib] # For "sage", "sage -t", ... cython = [SPKG_INSTALL_REQUIRES_cython] # For "sage --cython" From 83577075b3c085f97dd53d303efc47c4b73131f3 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Thu, 25 Sep 2025 22:48:45 +0800 Subject: [PATCH 4/5] Remove sage_conf doctest --- src/sage/misc/package.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/sage/misc/package.py b/src/sage/misc/package.py index 3a5d750d6c8..7b84e87528b 100644 --- a/src/sage/misc/package.py +++ b/src/sage/misc/package.py @@ -274,13 +274,6 @@ def list_packages(*pkg_types: str, pkg_sources: list[str] = ['normal', 'pip', 's 'babel', ... 'zipp'] - sage: sage_conf_info = L['sage_conf'] - sage: sage_conf_info.type - 'standard' - sage: sage_conf_info.is_installed() - True - sage: sage_conf_info.source - 'script' sage: # optional - sage_spkg internet sage: L = list_packages(pkg_sources=['pip'], local=True) From b806949acde7d519e38ae969a5e3498fc8006b09 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Sun, 28 Sep 2025 07:53:38 +0800 Subject: [PATCH 5/5] Remove failing test in `sage.env` that test importing `sage.all` --- src/sage/env.py | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/src/sage/env.py b/src/sage/env.py index d8ca93d398f..86c078f5dd2 100644 --- a/src/sage/env.py +++ b/src/sage/env.py @@ -2,27 +2,6 @@ r""" Sage Runtime Environment -Verify that importing ``sage.all`` works in Sage's Python without any -``SAGE_`` environment variables, and has the same ``SAGE_ROOT`` and -``SAGE_LOCAL`` (see also :issue:`29446`). If ``SAGE_ROOT`` is a path, -we normalize it, but keep in mind that ``SAGE_ROOT`` may also be -``None``:: - - sage: env = {k:v for (k,v) in os.environ.items() if not k.startswith("SAGE_")} - sage: from subprocess import check_output - sage: module_name = "sage.all" # hide .all import from the linter - sage: cmd = f"from {module_name} import SAGE_ROOT, SAGE_LOCAL;" - sage: cmd += "from os.path import samefile;" - sage: if SAGE_ROOT is None: - ....: cmd += "s1 = SAGE_ROOT is None;" - ....: else: - ....: cmd += f"s1 = samefile(SAGE_ROOT, '{SAGE_ROOT}');" - sage: cmd += f"s2 = samefile(SAGE_LOCAL, '{SAGE_LOCAL}');" - sage: cmd += "print(s1 and s2);" - sage: out = check_output([sys.executable, "-c", cmd], env=env).decode().strip() # long time - sage: out == "True" # long time - True - AUTHORS: - \R. Andrew Ohana (2012): initial version