diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 564b3e5464e..d12aa7418d5 100644 --- 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 index 4b22d9669a0..136072f4583 100644 --- 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 index 437d0345c0a..f9961e70676 100644 --- 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 index d290bd9883d..c33105271cc 100644 --- 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 index 4d6f4106546..3952f386bcc 100644 --- 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 index 820da4fbbeb..0ebb2ee28f6 100644 --- 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 = "sage-support@googlegroups.com"}] classifiers = [ diff --git a/pkgs/sage-setup/sage_setup b/pkgs/sage-setup/sage_setup deleted file mode 120000 index 88b8133df49..00000000000 --- a/pkgs/sage-setup/sage_setup +++ /dev/null @@ -1 +0,0 @@ -../../src/sage_setup \ No newline at end of file diff --git a/src/sage_setup/__init__.py b/pkgs/sage-setup/sage_setup/__init__.py similarity index 100% rename from src/sage_setup/__init__.py rename to pkgs/sage-setup/sage_setup/__init__.py diff --git a/pkgs/sage-setup/sage_setup/autogen b/pkgs/sage-setup/sage_setup/autogen new file mode 120000 index 00000000000..51e70ef0337 --- /dev/null +++ b/pkgs/sage-setup/sage_setup/autogen @@ -0,0 +1 @@ +../../../src/autogen \ No newline at end of file diff --git a/src/sage_setup/autogen/interpreters/internal/specs/__init__.py b/pkgs/sage-setup/sage_setup/command/__init__.py similarity index 100% rename from src/sage_setup/autogen/interpreters/internal/specs/__init__.py rename to pkgs/sage-setup/sage_setup/command/__init__.py diff --git a/src/sage_setup/command/sage_build_cython.py b/pkgs/sage-setup/sage_setup/command/sage_build_cython.py similarity index 100% rename from src/sage_setup/command/sage_build_cython.py rename to pkgs/sage-setup/sage_setup/command/sage_build_cython.py diff --git a/src/sage_setup/command/sage_build_ext.py b/pkgs/sage-setup/sage_setup/command/sage_build_ext.py similarity index 100% rename from src/sage_setup/command/sage_build_ext.py rename to pkgs/sage-setup/sage_setup/command/sage_build_ext.py diff --git a/src/sage_setup/command/sage_build_ext_minimal.py b/pkgs/sage-setup/sage_setup/command/sage_build_ext_minimal.py similarity index 100% rename from src/sage_setup/command/sage_build_ext_minimal.py rename to pkgs/sage-setup/sage_setup/command/sage_build_ext_minimal.py diff --git a/src/sage_setup/command/sage_build_py.py b/pkgs/sage-setup/sage_setup/command/sage_build_py.py similarity index 100% rename from src/sage_setup/command/sage_build_py.py rename to pkgs/sage-setup/sage_setup/command/sage_build_py.py diff --git a/src/sage_setup/command/sage_install.py b/pkgs/sage-setup/sage_setup/command/sage_install.py similarity index 100% rename from src/sage_setup/command/sage_install.py rename to pkgs/sage-setup/sage_setup/command/sage_install.py diff --git a/src/sage_setup/cython_options.py b/pkgs/sage-setup/sage_setup/cython_options.py similarity index 100% rename from src/sage_setup/cython_options.py rename to pkgs/sage-setup/sage_setup/cython_options.py diff --git a/src/sage_setup/excepthook.py b/pkgs/sage-setup/sage_setup/excepthook.py similarity index 100% rename from src/sage_setup/excepthook.py rename to pkgs/sage-setup/sage_setup/excepthook.py diff --git a/src/sage_setup/extensions.py b/pkgs/sage-setup/sage_setup/extensions.py similarity index 100% rename from src/sage_setup/extensions.py rename to pkgs/sage-setup/sage_setup/extensions.py diff --git a/src/sage_setup/find.py b/pkgs/sage-setup/sage_setup/find.py similarity index 100% rename from src/sage_setup/find.py rename to pkgs/sage-setup/sage_setup/find.py diff --git a/src/sage_setup/library_order.py b/pkgs/sage-setup/sage_setup/library_order.py similarity index 100% rename from src/sage_setup/library_order.py rename to pkgs/sage-setup/sage_setup/library_order.py diff --git a/src/sage_setup/run_parallel.py b/pkgs/sage-setup/sage_setup/run_parallel.py similarity index 100% rename from src/sage_setup/run_parallel.py rename to pkgs/sage-setup/sage_setup/run_parallel.py diff --git a/src/sage_setup/setenv.py b/pkgs/sage-setup/sage_setup/setenv.py similarity index 100% rename from src/sage_setup/setenv.py rename to pkgs/sage-setup/sage_setup/setenv.py diff --git a/src/sage_setup/util.py b/pkgs/sage-setup/sage_setup/util.py similarity index 100% rename from src/sage_setup/util.py rename to pkgs/sage-setup/sage_setup/util.py diff --git a/src/MANIFEST.in b/src/MANIFEST.in index 8428dfff314..456c469ed69 100644 --- 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 b/src/autogen/__init__.py similarity index 100% rename from src/sage_setup/autogen/__init__.py rename to src/autogen/__init__.py diff --git a/src/sage_setup/autogen/__main__.py b/src/autogen/__main__.py similarity index 100% rename from src/sage_setup/autogen/__main__.py rename to src/autogen/__main__.py diff --git a/src/sage_setup/autogen/flint/README.md b/src/autogen/flint/README.md similarity index 90% rename from src/sage_setup/autogen/flint/README.md rename to src/autogen/flint/README.md index 2205b7ed82e..7f2f88d2ba6 100644 --- a/src/sage_setup/autogen/flint/README.md +++ b/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 b/src/autogen/flint/__init__.py similarity index 100% rename from src/sage_setup/autogen/flint/__init__.py rename to src/autogen/flint/__init__.py diff --git a/src/sage_setup/autogen/flint/env.py b/src/autogen/flint/env.py similarity index 100% rename from src/sage_setup/autogen/flint/env.py rename to src/autogen/flint/env.py diff --git a/src/sage_setup/autogen/flint/macros/acb_macros.pxd b/src/autogen/flint/macros/acb_macros.pxd similarity index 100% rename from src/sage_setup/autogen/flint/macros/acb_macros.pxd rename to src/autogen/flint/macros/acb_macros.pxd diff --git a/src/sage_setup/autogen/flint/macros/acb_mat_macros.pxd b/src/autogen/flint/macros/acb_mat_macros.pxd similarity index 100% rename from src/sage_setup/autogen/flint/macros/acb_mat_macros.pxd rename to src/autogen/flint/macros/acb_mat_macros.pxd diff --git a/src/sage_setup/autogen/flint/macros/acb_poly_macros.pxd b/src/autogen/flint/macros/acb_poly_macros.pxd similarity index 100% rename from src/sage_setup/autogen/flint/macros/acb_poly_macros.pxd rename to src/autogen/flint/macros/acb_poly_macros.pxd diff --git a/src/sage_setup/autogen/flint/macros/arb_macros.pxd b/src/autogen/flint/macros/arb_macros.pxd similarity index 100% rename from src/sage_setup/autogen/flint/macros/arb_macros.pxd rename to src/autogen/flint/macros/arb_macros.pxd diff --git a/src/sage_setup/autogen/flint/macros/arb_mat_macros.pxd b/src/autogen/flint/macros/arb_mat_macros.pxd similarity index 100% rename from src/sage_setup/autogen/flint/macros/arb_mat_macros.pxd rename to src/autogen/flint/macros/arb_mat_macros.pxd diff --git a/src/sage_setup/autogen/flint/macros/fmpq_mat_macros.pxd b/src/autogen/flint/macros/fmpq_mat_macros.pxd similarity index 100% rename from src/sage_setup/autogen/flint/macros/fmpq_mat_macros.pxd rename to src/autogen/flint/macros/fmpq_mat_macros.pxd diff --git a/src/sage_setup/autogen/flint/macros/fmpz_macros.pxd b/src/autogen/flint/macros/fmpz_macros.pxd similarity index 100% rename from src/sage_setup/autogen/flint/macros/fmpz_macros.pxd rename to src/autogen/flint/macros/fmpz_macros.pxd diff --git a/src/sage_setup/autogen/flint/macros/fmpz_mat_macros.pxd b/src/autogen/flint/macros/fmpz_mat_macros.pxd similarity index 100% rename from src/sage_setup/autogen/flint/macros/fmpz_mat_macros.pxd rename to src/autogen/flint/macros/fmpz_mat_macros.pxd diff --git a/src/sage_setup/autogen/flint/macros/fmpz_poly_macros.pxd b/src/autogen/flint/macros/fmpz_poly_macros.pxd similarity index 100% rename from src/sage_setup/autogen/flint/macros/fmpz_poly_macros.pxd rename to src/autogen/flint/macros/fmpz_poly_macros.pxd diff --git a/src/sage_setup/autogen/flint/macros/mag_macros.pxd b/src/autogen/flint/macros/mag_macros.pxd similarity index 100% rename from src/sage_setup/autogen/flint/macros/mag_macros.pxd rename to src/autogen/flint/macros/mag_macros.pxd diff --git a/src/sage_setup/autogen/flint/reader.py b/src/autogen/flint/reader.py similarity index 100% rename from src/sage_setup/autogen/flint/reader.py rename to src/autogen/flint/reader.py diff --git a/src/sage_setup/autogen/flint/templates/flint_sage.pyx.template b/src/autogen/flint/templates/flint_sage.pyx.template similarity index 93% rename from src/sage_setup/autogen/flint/templates/flint_sage.pyx.template rename to src/autogen/flint/templates/flint_sage.pyx.template index a553d99d33c..90af62b4670 100644 --- a/src/sage_setup/autogen/flint/templates/flint_sage.pyx.template +++ b/src/autogen/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/src/sage_setup/autogen/flint/templates/flint_wrap.h.template b/src/autogen/flint/templates/flint_wrap.h.template similarity index 96% rename from src/sage_setup/autogen/flint/templates/flint_wrap.h.template rename to src/autogen/flint/templates/flint_wrap.h.template index ec58aa2f602..4ff387ba5dc 100644 --- a/src/sage_setup/autogen/flint/templates/flint_wrap.h.template +++ b/src/autogen/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/src/sage_setup/autogen/flint/templates/types.pxd.template b/src/autogen/flint/templates/types.pxd.template similarity index 99% rename from src/sage_setup/autogen/flint/templates/types.pxd.template rename to src/autogen/flint/templates/types.pxd.template index 4b9d982c7fa..f19f1fcc722 100644 --- a/src/sage_setup/autogen/flint/templates/types.pxd.template +++ b/src/autogen/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 b/src/autogen/flint/writer.py similarity index 100% rename from src/sage_setup/autogen/flint/writer.py rename to src/autogen/flint/writer.py diff --git a/src/sage_setup/autogen/flint_autogen.py b/src/autogen/flint_autogen.py similarity index 100% rename from src/sage_setup/autogen/flint_autogen.py rename to src/autogen/flint_autogen.py diff --git a/src/sage_setup/autogen/interpreters/__main__.py b/src/autogen/interpreters/__main__.py old mode 100755 new mode 100644 similarity index 100% rename from src/sage_setup/autogen/interpreters/__main__.py rename to src/autogen/interpreters/__main__.py diff --git a/src/sage_setup/autogen/interpreters/internal/__init__.py b/src/autogen/interpreters/internal/__init__.py similarity index 100% rename from src/sage_setup/autogen/interpreters/internal/__init__.py rename to src/autogen/interpreters/internal/__init__.py diff --git a/src/sage_setup/autogen/interpreters/internal/generator.py b/src/autogen/interpreters/internal/generator.py similarity index 100% rename from src/sage_setup/autogen/interpreters/internal/generator.py rename to src/autogen/interpreters/internal/generator.py diff --git a/src/sage_setup/autogen/interpreters/internal/instructions.py b/src/autogen/interpreters/internal/instructions.py similarity index 100% rename from src/sage_setup/autogen/interpreters/internal/instructions.py rename to src/autogen/interpreters/internal/instructions.py diff --git a/src/sage_setup/autogen/interpreters/internal/memory.py b/src/autogen/interpreters/internal/memory.py similarity index 100% rename from src/sage_setup/autogen/interpreters/internal/memory.py rename to src/autogen/interpreters/internal/memory.py diff --git a/src/sage_setup/command/__init__.py b/src/autogen/interpreters/internal/specs/__init__.py similarity index 100% rename from src/sage_setup/command/__init__.py rename to src/autogen/interpreters/internal/specs/__init__.py diff --git a/src/sage_setup/autogen/interpreters/internal/specs/base.py b/src/autogen/interpreters/internal/specs/base.py similarity index 100% rename from src/sage_setup/autogen/interpreters/internal/specs/base.py rename to src/autogen/interpreters/internal/specs/base.py diff --git a/src/sage_setup/autogen/interpreters/internal/specs/cc.py b/src/autogen/interpreters/internal/specs/cc.py similarity index 100% rename from src/sage_setup/autogen/interpreters/internal/specs/cc.py rename to src/autogen/interpreters/internal/specs/cc.py diff --git a/src/sage_setup/autogen/interpreters/internal/specs/cdf.py b/src/autogen/interpreters/internal/specs/cdf.py similarity index 100% rename from src/sage_setup/autogen/interpreters/internal/specs/cdf.py rename to src/autogen/interpreters/internal/specs/cdf.py diff --git a/src/sage_setup/autogen/interpreters/internal/specs/element.py b/src/autogen/interpreters/internal/specs/element.py similarity index 100% rename from src/sage_setup/autogen/interpreters/internal/specs/element.py rename to src/autogen/interpreters/internal/specs/element.py diff --git a/src/sage_setup/autogen/interpreters/internal/specs/python.py b/src/autogen/interpreters/internal/specs/python.py similarity index 100% rename from src/sage_setup/autogen/interpreters/internal/specs/python.py rename to src/autogen/interpreters/internal/specs/python.py diff --git a/src/sage_setup/autogen/interpreters/internal/specs/rdf.py b/src/autogen/interpreters/internal/specs/rdf.py similarity index 100% rename from src/sage_setup/autogen/interpreters/internal/specs/rdf.py rename to src/autogen/interpreters/internal/specs/rdf.py diff --git a/src/sage_setup/autogen/interpreters/internal/specs/rr.py b/src/autogen/interpreters/internal/specs/rr.py similarity index 100% rename from src/sage_setup/autogen/interpreters/internal/specs/rr.py rename to src/autogen/interpreters/internal/specs/rr.py diff --git a/src/sage_setup/autogen/interpreters/internal/storage.py b/src/autogen/interpreters/internal/storage.py similarity index 100% rename from src/sage_setup/autogen/interpreters/internal/storage.py rename to src/autogen/interpreters/internal/storage.py diff --git a/src/sage_setup/autogen/interpreters/internal/utils.py b/src/autogen/interpreters/internal/utils.py similarity index 100% rename from src/sage_setup/autogen/interpreters/internal/utils.py rename to src/autogen/interpreters/internal/utils.py diff --git a/src/sage/ext/interpreters/meson.build b/src/sage/ext/interpreters/meson.build index f965ce83da0..d94e85991f0 100644 --- 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,