Remove sage_setup

.github/workflows/build.yml

@@ -91,7 +91,7 @@ jobs:
           - "src/sage/[a-f]*"
           - "src/sage/[g-o]*"
           - "src/sage/[p-z]*"
-          - "src/doc src/sage_docbuild src/sage_setup"
+          - "src/doc src/sage_docbuild"
     steps:
       - name: Maximize build disk space
         uses: easimon/maximize-build-space@v10

.github/workflows/ci-meson.yml

@@ -163,10 +163,6 @@ jobs:
       - name: Test
         shell: bash -l {0}
         run: |
-          # We don't install sage_setup, so don't try to test it
-          # If editable then deleting the directory will cause sage to detect rebuild, which will cause ninja to fail
-          # so we don't delete the directory in this case
-          ${{ matrix.editable && 'true' || 'rm -R ./src/sage_setup/' }}
           if [[ "$RUNNER_OS" == "Windows" ]]; then
             # Ignore errors on Windows, for now
             pytest --doctest-ignore-import-errors --doctest -rfEs -s src || true

.gitignore

@@ -140,11 +140,6 @@ __pycache__/
 **/*.py[cod]
 *$py.class
 
-# Generated by sage_setup.autogen
-/src/sage/ext/interpreters
-!/src/sage/ext/interpreters/meson.build
-!/src/sage/ext/interpreters/README
-
 # Generated Cython files
 *.so
 **/*.so
@@ -307,6 +302,7 @@ subprojects/packagecache
 src/sage/interfaces/__init__.py
 src/sage/crypto/block_cipher/__init__.py
 src/sage/crypto/public_key/__init__.py
+src/sage/ext/interpreters/__init__.py
 src/sage/logic/__init__.py
 src/sage/parallel/__init__.py
 src/sage/dynamics/cellular_automata/__init__.py

.vscode/settings.json

@@ -9,9 +9,7 @@
         "build/pkgs/*/src": true,
         // Exclude symbolic links into SAGE_ROOT/src/
         "pkgs/sage-docbuild/sage_docbuild": true,
-        "pkgs/sage-setup/sage_setup": true,
         "pkgs/sagemath-*/sage": true,
-        "pkgs/sagemath-*/sage_setup": true
     },
     "python.testing.pytestEnabled": true,
     "python.testing.pytestArgs": [

Makefile

@@ -131,9 +131,6 @@ sagelib-clean:
 sage_docbuild-clean:
 	(cd "$(SAGE_ROOT)/build/pkgs/sage_docbuild/src" && rm -rf build)
 
-sage_setup-clean:
-	(cd "$(SAGE_ROOT)/build/pkgs/sage_setup/src" && rm -rf build)
-
 build-clean: clean doc-clean sagelib-clean sage_docbuild-clean
 
 doc-clean:

README.md

@@ -489,9 +489,6 @@ SAGE_ROOT                 Root directory (create by git clone)
 │   ├── sage-docbuild
 │   │   ├── sage_docbuild/
 │   │   └── setup.py
-│   ├── sage-setup
-│   │   ├── sage_setup/
-│   │   └── setup.py
 │   └── sagemath-standard
 │       ├── bin/
 │       ├── sage -> ../../src/sage

build/bin/sage-dist-helpers

@@ -394,8 +394,7 @@ sdh_actually_pip_install_wheel() {
     distname=$1
     shift
     # Issue #32659: pip no longer reinstalls local wheels if the version is the same.
-    # Because neither (1) applying patches nor (2) local changes (in the case
-    # of sage-setup, etc.) bump the version number, we need to
+    # Because neither (1) applying patches nor (2) local changes bump the version number, we need to
     # override this behavior.  The pip install option --force-reinstall does too
     # much -- it also reinstalls all dependencies, which we do not want.
     $sudo sage-pip-uninstall "$distname" 2>&1 | sed '/^WARNING: Skipping .* as it is not installed./d'

build/make/Makefile.in

@@ -748,7 +748,7 @@ $(1)-uninstall: $(1)-$(4)-uninstall
 
 $(1)-clean: $(1)-uninstall
 
-$(1)-sdist: FORCE python_build sage_setup cython
+$(1)-sdist: FORCE python_build cython
 	$(AM_V_at) cd '$$(SAGE_ROOT)' && \
 		. '$$(SAGE_ROOT)/src/bin/sage-src-env-config' && \
 		. '$$(SAGE_ROOT)/src/bin/sage-env-config' && \

build/pkgs/sagelib/spkg-install.in

@@ -29,9 +29,6 @@ export SAGE_DOC_SRC=/doesnotexist
 export SAGE_PKGCONFIG=/doesnotexist
 export SAGE_SHARE=/doesnotexist
 
-# However, we only unset SAGE_PKG_CONFIG_PATH.
-# sage_setup.setenv receives them from sage.env;
-# the poisoned environment variables would override them.
 unset SAGE_PKG_CONFIG_PATH
 
 # Issue #30903: We cannot poison SAGE_DOC because setup.py installs the Jupyter kernel

build/pkgs/sagemath_bliss/dependencies

@@ -1 +1 @@
- bliss cysignals | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig $(PYTHON)
+ bliss cysignals | $(PYTHON_TOOLCHAIN) sagemath_environment cython pkgconfig $(PYTHON)

build/pkgs/sagemath_categories/dependencies

@@ -1 +1 @@
- sagemath_objects | $(PYTHON_TOOLCHAIN) sagemath_environment sage_setup cython pkgconfig python_build $(PYTHON)
+ sagemath_objects | $(PYTHON_TOOLCHAIN) sagemath_environment cython pkgconfig python_build $(PYTHON)

build/pkgs/sagemath_coxeter3/dependencies

@@ -1 +1 @@
- coxeter3 | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig $(PYTHON)
+ coxeter3 | $(PYTHON_TOOLCHAIN) sagemath_environment cython pkgconfig $(PYTHON)

build/pkgs/sagemath_mcqd/dependencies

@@ -1 +1 @@
- mcqd memory_allocator cysignals | $(PYTHON_TOOLCHAIN) sage_setup cython pkgconfig $(PYTHON)
+ mcqd memory_allocator cysignals | $(PYTHON_TOOLCHAIN) cython pkgconfig $(PYTHON)

build/pkgs/sagemath_meataxe/dependencies

@@ -1 +1 @@
- meataxe cysignals | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig $(PYTHON)
+ meataxe cysignals | $(PYTHON_TOOLCHAIN) sagemath_environment cython pkgconfig $(PYTHON)

build/pkgs/sagemath_objects/dependencies

@@ -1,3 +1,3 @@
-FORCE  cysignals gmpy2 | $(PYTHON_TOOLCHAIN) sagemath_environment sage_setup cython pkgconfig python_build $(PYTHON)
+FORCE  cysignals gmpy2 | $(PYTHON_TOOLCHAIN) sagemath_environment cython pkgconfig python_build $(PYTHON)
 
 # FORCE: Always run the spkg-install script

build/pkgs/sagemath_sirocco/dependencies

@@ -1 +1 @@
- sirocco cypari cysignals mpfr | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig $(PYTHON)
+ sirocco cypari cysignals mpfr | $(PYTHON_TOOLCHAIN) sagemath_environment cython pkgconfig $(PYTHON)

build/pkgs/sagemath_tdlib/dependencies

@@ -1 +1 @@
- tdlib cysignals | $(PYTHON_TOOLCHAIN) sage_setup sagemath_environment cython pkgconfig $(PYTHON)
+ tdlib cysignals | $(PYTHON_TOOLCHAIN) sagemath_environment cython pkgconfig $(PYTHON)

configure.ac

@@ -540,7 +540,7 @@ AC_ARG_ENABLE([doc],
 AC_ARG_ENABLE([sagelib],
   AS_HELP_STRING([--disable-sagelib],
                  [disable build of the Sage library and packages depending on it]), [
-    for pkg in sagelib sage_docbuild sage_setup; do
+    for pkg in sagelib sage_docbuild; do
       AS_VAR_SET([SAGE_ENABLE_$pkg], [$enableval])
     done
   ])

conftest.py

@@ -11,7 +11,7 @@
 import inspect
 import sys
 import warnings
-from typing import Any, Iterable, Optional, TYPE_CHECKING
+from typing import TYPE_CHECKING, Any, Iterable, Optional
 
 import pytest
 from _pytest.doctest import (
@@ -280,7 +280,6 @@ def pytest_ignore_collect(
     root = config.rootpath
     if (
         is_subpath(collection_path, root / "src" / "sage_docbuild")
-        or is_subpath(collection_path, root / "src" / "sage_setup")
         or collection_path == root / "src" / "build-docs.py"
     ):
         # Fails to import with Meson
@@ -390,8 +389,8 @@ def tmpfile():
     * https://github.com/pytest-dev/pytest/issues/13669
 
     """
-    from tempfile import NamedTemporaryFile
     from os import unlink
+    from tempfile import NamedTemporaryFile
     t = NamedTemporaryFile(delete=False)
     yield t
     unlink(t.name)

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_setup
     SPKG_INSTALL_REQUIRES_sagemath_environment
     SPKG_INSTALL_REQUIRES_cython
     SPKG_INSTALL_REQUIRES_cysignals

pkgs/sagemath-categories/pyproject.toml.m4

@@ -4,7 +4,6 @@ include(`sage_spkg_versions_toml.m4')dnl' -*- conf-toml -*-
 requires = [
     SPKG_INSTALL_REQUIRES_setuptools
     SPKG_INSTALL_REQUIRES_wheel
-    SPKG_INSTALL_REQUIRES_sage_setup
     SPKG_INSTALL_REQUIRES_sagemath_environment
     SPKG_INSTALL_REQUIRES_sagemath_objects
     SPKG_INSTALL_REQUIRES_cython

pkgs/sagemath-coxeter3/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_setup
     SPKG_INSTALL_REQUIRES_sagemath_environment
     SPKG_INSTALL_REQUIRES_sagemath_objects
     SPKG_INSTALL_REQUIRES_cython