Merge branch 'pr/tornaria/37287' into conda-update

Author: tobiasdiez

.devcontainer/onCreate-conda.sh

@@ -9,5 +9,5 @@ conda init bash
 # Build sage
 conda run -n sage-dev ./bootstrap
 conda run -n sage-dev ./configure --with-python=/opt/conda/envs/sage-dev/bin/python --prefix=/opt/conda/envs/sage-dev
-conda run -n sage-dev pip install --no-build-isolation -v -v -e ./pkgs/sage-conf ./pkgs/sage-setup 
+conda run -n sage-dev pip install --no-build-isolation -v -v -e ./pkgs/sage-conf
 conda run -n sage-dev pip install --no-build-isolation -v -v -e ./src

.github/workflows/ci-conda.yml

@@ -76,8 +76,8 @@ 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 -v -v -e ./pkgs/sage-setup
-          pip install --no-build-isolation --no-deps -v -v -e ./src
+          pip install --no-build-isolation --no-deps -v -v -e ./pkgs/sage-conf
+          pip install --no-build-isolation --no-deps --config-settings editable_mode=compat -v -v -e ./src
         env:
           SAGE_NUM_THREADS: 2
 

.gitpod.yml

@@ -12,7 +12,7 @@ tasks:
       && conda activate $(pwd)/venv
       && ./bootstrap
       && ./configure --enable-build-as-root --with-python=$CONDA_PREFIX/bin/python --prefix=$CONDA_PREFIX
-      && pip install --no-build-isolation -v -v -e ./pkgs/sage-conf ./pkgs/sage-setup
+      && pip install --no-build-isolation -v -v -e ./pkgs/sage-conf
       && pip install --no-build-isolation -v -v -e ./src
     # Activate conda environment, set up Trac remote
     # RestructuredText extension recommends python extension, although we have already installed it

pkgs/sagemath-standard/sage_setup

@@ -0,0 +1 @@
+../../src/sage_setup

src/MANIFEST.in

@@ -3,10 +3,15 @@ include VERSION.txt
 global-include *.pxi *.pxd *.h *.hpp
 
 prune sage/ext/interpreters   # In particular, __init__.py must not be present in the distribution; or sage_setup.autogen.interpreters.rebuild will not generate the code
-prune sage_setup
 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.

src/doc/en/installation/conda.rst

@@ -131,7 +131,7 @@ Here we assume that you are using a git checkout.
   - Bootstrap the source tree and install the build prerequisites and the Sage library::
 
       $ ./bootstrap
-      $ pip install --no-build-isolation -v -v --editable ./pkgs/sage-conf_conda ./pkgs/sage-setup
+      $ pip install --no-build-isolation -v -v --editable ./pkgs/sage-conf_conda
       $ pip install --no-build-isolation --config-settings editable_mode=compat -v -v --editable ./src
 
   - Verify that Sage has been installed::

src/pyproject.toml.m4

@@ -1,15 +1,13 @@
 [build-system]
 # Minimum requirements for the build system to execute.
 requires = [
-    "sage_setup[autogen]",
     # Some version of sage-conf is required.
     # Note that PEP517/518 have no notion of optional sage_spkg dependencies:
     # https://github.com/pypa/pip/issues/6144
      esyscmd(`sage-get-system-packages install-requires-toml \
         sage_conf      \
         setuptools \
         wheel          \
-        sage_setup     \
         cypari         \
         cysignals      \
         cython         \