sagemath · tobiasdiez · Nov 25, 2024 · Nov 29, 2024 · Nov 30, 2024 · Nov 30, 2024
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -270,7 +270,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

diff --git a/.github/workflows/ci-conda.yml b/.github/workflows/ci-conda.yml
@@ -77,6 +77,7 @@ jobs:
         shell: bash -l {0}
         run: |
           # Use --no-deps and pip check below to verify that all necessary dependencies are installed via conda.
+          pip install --no-build-isolation --no-deps --config-settings editable_mode=compat -v -v -e ./pkgs/sage-setup
           pip install --no-build-isolation --no-deps --config-settings editable_mode=compat -v -v -e ./src
         env:
           SAGE_NUM_THREADS: 5

diff --git a/.github/workflows/ci-meson.yml b/.github/workflows/ci-meson.yml
@@ -92,8 +92,6 @@ jobs:
       - name: Test
         shell: bash -l {0}
         run: |
-          # We don't install sage_setup, so don't try to test it
-          rm -R ./src/sage_setup/
           ./sage -t --all -p4 --format github
 
       - name: Upload log

diff --git a/.gitignore b/.gitignore
@@ -140,7 +140,7 @@ __pycache__/
 **/*.py[cod]
 *$py.class
 
-# Generated by sage_setup.autogen
+# Generated by autogen
 /src/sage/ext/interpreters
 !/src/sage/ext/interpreters/meson.build
 !/src/sage/ext/interpreters/README

diff --git a/pkgs/sage-setup/README.rst b/pkgs/sage-setup/README.rst
@@ -1,4 +1,4 @@
 sage-setup: Build system of the SageMath library
 ================================================
 
-This is the build system of the Sage library, based on setuptools.
+This is the old build system of the Sage library, based on setuptools.
diff --git a/pkgs/sage-setup/pyproject.toml b/pkgs/sage-setup/pyproject.toml
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "sage-setup"
-description = "Sage: Open Source Mathematics Software: Build system of the Sage library"
+description = "Sage: Open Source Mathematics Software: Old build system of the Sage library"
 license = {text = "GNU General Public License (GPL) v2 or later"}
 authors = [{name = "The Sage Developers", email = "[email protected]"}]
 classifiers = [

diff --git a/pkgs/sage-setup/sage_setup b/pkgs/sage-setup/sage_setup
diff --git a/src/sage_setup/__init__.py → pkgs/sage-setup/sage_setup/__init__.py b/src/sage_setup/__init__.py → pkgs/sage-setup/sage_setup/__init__.py
diff --git a/pkgs/sage-setup/sage_setup/autogen b/pkgs/sage-setup/sage_setup/autogen
@@ -0,0 +1 @@
+../../../src/autogen
diff --git a/...n/interpreters/internal/specs/__init__.py → ...sage-setup/sage_setup/command/__init__.py b/...n/interpreters/internal/specs/__init__.py → ...sage-setup/sage_setup/command/__init__.py
diff --git a/src/sage_setup/command/sage_build_cython.py → ...p/sage_setup/command/sage_build_cython.py b/src/sage_setup/command/sage_build_cython.py → ...p/sage_setup/command/sage_build_cython.py
diff --git a/src/sage_setup/command/sage_build_ext.py → ...etup/sage_setup/command/sage_build_ext.py b/src/sage_setup/command/sage_build_ext.py → ...etup/sage_setup/command/sage_build_ext.py
diff --git a/...e_setup/command/sage_build_ext_minimal.py → ...e_setup/command/sage_build_ext_minimal.py b/...e_setup/command/sage_build_ext_minimal.py → ...e_setup/command/sage_build_ext_minimal.py
diff --git a/src/sage_setup/command/sage_build_py.py → ...setup/sage_setup/command/sage_build_py.py b/src/sage_setup/command/sage_build_py.py → ...setup/sage_setup/command/sage_build_py.py
diff --git a/src/sage_setup/command/sage_install.py → ...-setup/sage_setup/command/sage_install.py b/src/sage_setup/command/sage_install.py → ...-setup/sage_setup/command/sage_install.py
diff --git a/src/sage_setup/cython_options.py → pkgs/sage-setup/sage_setup/cython_options.py b/src/sage_setup/cython_options.py → pkgs/sage-setup/sage_setup/cython_options.py
diff --git a/src/sage_setup/excepthook.py → pkgs/sage-setup/sage_setup/excepthook.py b/src/sage_setup/excepthook.py → pkgs/sage-setup/sage_setup/excepthook.py
diff --git a/src/sage_setup/extensions.py → pkgs/sage-setup/sage_setup/extensions.py b/src/sage_setup/extensions.py → pkgs/sage-setup/sage_setup/extensions.py
diff --git a/src/sage_setup/find.py → pkgs/sage-setup/sage_setup/find.py b/src/sage_setup/find.py → pkgs/sage-setup/sage_setup/find.py
diff --git a/src/sage_setup/library_order.py → pkgs/sage-setup/sage_setup/library_order.py b/src/sage_setup/library_order.py → pkgs/sage-setup/sage_setup/library_order.py
diff --git a/src/sage_setup/run_parallel.py → pkgs/sage-setup/sage_setup/run_parallel.py b/src/sage_setup/run_parallel.py → pkgs/sage-setup/sage_setup/run_parallel.py
diff --git a/src/sage_setup/setenv.py → pkgs/sage-setup/sage_setup/setenv.py b/src/sage_setup/setenv.py → pkgs/sage-setup/sage_setup/setenv.py
diff --git a/src/sage_setup/util.py → pkgs/sage-setup/sage_setup/util.py b/src/sage_setup/util.py → pkgs/sage-setup/sage_setup/util.py
diff --git a/src/MANIFEST.in b/src/MANIFEST.in
@@ -6,12 +6,6 @@ prune sage/ext/interpreters   # In particular, __init__.py must not be present i
 prune sage_docbuild
 prune doc
 
-# include sage_setup
-recursive-include sage_setup *
-prune sage_setup/autogen/flint*
-exclude sage_setup/autogen/flint*
-exclude sage_setup/autogen/giacpy*
-
 #
 # Most C and C++ files are generated by Cython and should not
 # be included in the sdist.

diff --git a/src/sage_setup/autogen/__init__.py → src/autogen/__init__.py b/src/sage_setup/autogen/__init__.py → src/autogen/__init__.py
diff --git a/src/sage_setup/autogen/__main__.py → src/autogen/__main__.py b/src/sage_setup/autogen/__main__.py → src/autogen/__main__.py
diff --git a/src/sage_setup/autogen/flint/README.md → src/autogen/flint/README.md b/src/sage_setup/autogen/flint/README.md → src/autogen/flint/README.md
@@ -21,7 +21,7 @@ autogeneration
 5. Set the environment variable `FLINT_GIT_DIR`
 
 6. Run the `flint_autogen.py` script e.g. `python
-   $SAGE_ROOT/src/sage_setup/autogen/flint_autogen.py`. The script writes down
+   $SAGE_ROOT/src/autogen/flint_autogen.py`. The script writes down
    the headers in the sage source tree `$SAGE_ROOT/src/sage/libs/flint/`
 
 
@@ -31,5 +31,5 @@ Additional notes
 - macros in flint documentation are not converted into cython declarations
   (because they lack a signature). The cython signature of flint macros must be
   manually written down in the files contained
-  `SAGE_SRC/sage/src/sage_setup/autogen/flint/macros`
+  `SAGE_SRC/sage/src/autogen/flint/macros`
   See https://github.com/flintlib/flint/issues/1529.
diff --git a/src/sage_setup/autogen/flint/__init__.py → src/autogen/flint/__init__.py b/src/sage_setup/autogen/flint/__init__.py → src/autogen/flint/__init__.py
diff --git a/src/sage_setup/autogen/flint/env.py → src/autogen/flint/env.py b/src/sage_setup/autogen/flint/env.py → src/autogen/flint/env.py
diff --git a/...setup/autogen/flint/macros/acb_macros.pxd → src/autogen/flint/macros/acb_macros.pxd b/...setup/autogen/flint/macros/acb_macros.pxd → src/autogen/flint/macros/acb_macros.pxd
diff --git a/...p/autogen/flint/macros/acb_mat_macros.pxd → src/autogen/flint/macros/acb_mat_macros.pxd b/...p/autogen/flint/macros/acb_mat_macros.pxd → src/autogen/flint/macros/acb_mat_macros.pxd
diff --git a/.../autogen/flint/macros/acb_poly_macros.pxd → src/autogen/flint/macros/acb_poly_macros.pxd b/.../autogen/flint/macros/acb_poly_macros.pxd → src/autogen/flint/macros/acb_poly_macros.pxd
diff --git a/...setup/autogen/flint/macros/arb_macros.pxd → src/autogen/flint/macros/arb_macros.pxd b/...setup/autogen/flint/macros/arb_macros.pxd → src/autogen/flint/macros/arb_macros.pxd
diff --git a/...p/autogen/flint/macros/arb_mat_macros.pxd → src/autogen/flint/macros/arb_mat_macros.pxd b/...p/autogen/flint/macros/arb_mat_macros.pxd → src/autogen/flint/macros/arb_mat_macros.pxd
diff --git a/.../autogen/flint/macros/fmpq_mat_macros.pxd → src/autogen/flint/macros/fmpq_mat_macros.pxd b/.../autogen/flint/macros/fmpq_mat_macros.pxd → src/autogen/flint/macros/fmpq_mat_macros.pxd
diff --git a/...etup/autogen/flint/macros/fmpz_macros.pxd → src/autogen/flint/macros/fmpz_macros.pxd b/...etup/autogen/flint/macros/fmpz_macros.pxd → src/autogen/flint/macros/fmpz_macros.pxd
diff --git a/.../autogen/flint/macros/fmpz_mat_macros.pxd → src/autogen/flint/macros/fmpz_mat_macros.pxd b/.../autogen/flint/macros/fmpz_mat_macros.pxd → src/autogen/flint/macros/fmpz_mat_macros.pxd
diff --git a/...autogen/flint/macros/fmpz_poly_macros.pxd → ...autogen/flint/macros/fmpz_poly_macros.pxd b/...autogen/flint/macros/fmpz_poly_macros.pxd → ...autogen/flint/macros/fmpz_poly_macros.pxd
diff --git a/...setup/autogen/flint/macros/mag_macros.pxd → src/autogen/flint/macros/mag_macros.pxd b/...setup/autogen/flint/macros/mag_macros.pxd → src/autogen/flint/macros/mag_macros.pxd
diff --git a/src/sage_setup/autogen/flint/reader.py → src/autogen/flint/reader.py b/src/sage_setup/autogen/flint/reader.py → src/autogen/flint/reader.py
diff --git a/...n/flint/templates/flint_sage.pyx.template → ...n/flint/templates/flint_sage.pyx.template b/...n/flint/templates/flint_sage.pyx.template → ...n/flint/templates/flint_sage.pyx.template
@@ -1,7 +1,7 @@
 # distutils: extra_compile_args = -D_XPG6
 
 # WARNING: src/sage/libs/flint/flint_sage.pyx is generated from
-# src/sage_setup/autogen/flint/templates/flint_sage.pyx.template;
+# src/autogen/flint/templates/flint_sage.pyx.template;
 # please make sure that you are modifying the correct file!
 """
 Flint imports

diff --git a/...gen/flint/templates/flint_wrap.h.template → ...gen/flint/templates/flint_wrap.h.template b/...gen/flint/templates/flint_wrap.h.template → ...gen/flint/templates/flint_wrap.h.template
@@ -1,5 +1,5 @@
 /* WARNING: src/sage/libs/flint/flint_wrap.h is generated from
- * src/sage_setup/autogen/flint/templates/flint_wrap.h.template
+ * src/autogen/flint/templates/flint_wrap.h.template
  * please make sure that you are modifying the correct file! */
 
 #ifndef SAGE_FLINT_WRAP_H

diff --git a/...utogen/flint/templates/types.pxd.template → ...utogen/flint/templates/types.pxd.template b/...utogen/flint/templates/types.pxd.template → ...utogen/flint/templates/types.pxd.template
@@ -1,7 +1,7 @@
 # distutils: depends = {HEADER_LIST}
 
 # WARNING: src/sage/libs/flint/types.pxd is generated from
-# src/sage_setup/autogen/flint/templates/types.pxd.template
+# src/autogen/flint/templates/types.pxd.template
 # please make sure that you are modifying the correct file!
 """
 Declarations for FLINT types

diff --git a/src/sage_setup/autogen/flint/writer.py → src/autogen/flint/writer.py b/src/sage_setup/autogen/flint/writer.py → src/autogen/flint/writer.py
diff --git a/src/sage_setup/autogen/flint_autogen.py → src/autogen/flint_autogen.py b/src/sage_setup/autogen/flint_autogen.py → src/autogen/flint_autogen.py
diff --git a/...ge_setup/autogen/interpreters/__main__.py → src/autogen/interpreters/__main__.py b/...ge_setup/autogen/interpreters/__main__.py → src/autogen/interpreters/__main__.py
diff --git a/...autogen/interpreters/internal/__init__.py → ...autogen/interpreters/internal/__init__.py b/...autogen/interpreters/internal/__init__.py → ...autogen/interpreters/internal/__init__.py
diff --git a/...utogen/interpreters/internal/generator.py → ...utogen/interpreters/internal/generator.py b/...utogen/interpreters/internal/generator.py → ...utogen/interpreters/internal/generator.py
diff --git a/...gen/interpreters/internal/instructions.py → ...gen/interpreters/internal/instructions.py b/...gen/interpreters/internal/instructions.py → ...gen/interpreters/internal/instructions.py
diff --git a/...p/autogen/interpreters/internal/memory.py → src/autogen/interpreters/internal/memory.py b/...p/autogen/interpreters/internal/memory.py → src/autogen/interpreters/internal/memory.py
diff --git a/src/sage_setup/command/__init__.py → ...n/interpreters/internal/specs/__init__.py b/src/sage_setup/command/__init__.py → ...n/interpreters/internal/specs/__init__.py
diff --git a/...togen/interpreters/internal/specs/base.py → ...togen/interpreters/internal/specs/base.py b/...togen/interpreters/internal/specs/base.py → ...togen/interpreters/internal/specs/base.py
diff --git a/...autogen/interpreters/internal/specs/cc.py → ...autogen/interpreters/internal/specs/cc.py b/...autogen/interpreters/internal/specs/cc.py → ...autogen/interpreters/internal/specs/cc.py
diff --git a/...utogen/interpreters/internal/specs/cdf.py → ...utogen/interpreters/internal/specs/cdf.py b/...utogen/interpreters/internal/specs/cdf.py → ...utogen/interpreters/internal/specs/cdf.py
diff --git a/...en/interpreters/internal/specs/element.py → ...en/interpreters/internal/specs/element.py b/...en/interpreters/internal/specs/element.py → ...en/interpreters/internal/specs/element.py
diff --git a/...gen/interpreters/internal/specs/python.py → ...gen/interpreters/internal/specs/python.py b/...gen/interpreters/internal/specs/python.py → ...gen/interpreters/internal/specs/python.py
diff --git a/...utogen/interpreters/internal/specs/rdf.py → ...utogen/interpreters/internal/specs/rdf.py b/...utogen/interpreters/internal/specs/rdf.py → ...utogen/interpreters/internal/specs/rdf.py
diff --git a/...autogen/interpreters/internal/specs/rr.py → ...autogen/interpreters/internal/specs/rr.py b/...autogen/interpreters/internal/specs/rr.py → ...autogen/interpreters/internal/specs/rr.py
diff --git a/.../autogen/interpreters/internal/storage.py → src/autogen/interpreters/internal/storage.py b/.../autogen/interpreters/internal/storage.py → src/autogen/interpreters/internal/storage.py
diff --git a/...up/autogen/interpreters/internal/utils.py → src/autogen/interpreters/internal/utils.py b/...up/autogen/interpreters/internal/utils.py → src/autogen/interpreters/internal/utils.py
diff --git a/src/sage/ext/interpreters/meson.build b/src/sage/ext/interpreters/meson.build
@@ -23,8 +23,8 @@ interpreters = custom_target(
     'interp_rr.c',
     '__init__.py',
   ],
-  input: '../../../sage_setup/autogen/interpreters/internal/__init__.py',
-  command: ['../../../sage_setup/autogen/interpreters/__main__.py', '@OUTDIR@'],
+  input: '../../../autogen/interpreters/internal/__init__.py',
+  command: ['../../../autogen/interpreters/__main__.py', '@OUTDIR@'],
   # Manually install the generated files instead of using install_sources
   # this is a workaround for https://github.com/mesonbuild/meson/issues/7372
   install: true,