Remove legacy direct installation of sagelib (configure --disable-editable --disable-wheels)

build/pkgs/sagelib/spkg-install.in

@@ -60,20 +60,16 @@ if [ "$SAGE_EDITABLE" = yes ]; then
         cd $SAGE_PKGS/sagelib/src && time sdh_setup_bdist_wheel && sdh_store_wheel .
     fi
 else
+    # Now implied: "$SAGE_WHEELS" = yes
     # Make sure that an installed old version of sagelib in which sage is an ordinary package
     # does not shadow the namespace package sage during the build.
     (cd "$SITEPACKAGESDIR" && rm -f sage/__init__.py)
     # Likewise, we should remove the egg-link that may have been installed previously.
     (cd "$SITEPACKAGESDIR" && rm -f sagemath-standard.egg-link)
 
-    if [ "$SAGE_WHEELS" = yes ]; then
-        # Use --no-build-isolation to avoid rebuilds because of dependencies:
-        # Compiling sage/interfaces/sagespawn.pyx because it depends on /private/var/folders/38/wnh4gf1552g_crsjnv2vmmww0000gp/T/pip-build-env-609n5985/overlay/lib/python3.10/site-packages/Cython/Includes/posix/unistd.pxd
-        sdh_pip_install --no-build-isolation .
-    else
-        SAGE_OPTIONAL_PACKAGES_WITH_EXTENSIONS+="mcqd,tdlib,coxeter3,sirocco,meataxe,bliss"
-        python3 -u setup.py --no-user-cfg build install || exit 1
-    fi
+    # Use --no-build-isolation to avoid rebuilds because of dependencies:
+    # Compiling sage/interfaces/sagespawn.pyx because it depends on /private/var/folders/38/wnh4gf1552g_crsjnv2vmmww0000gp/T/pip-build-env-609n5985/overlay/lib/python3.10/site-packages/Cython/Includes/posix/unistd.pxd
+    sdh_pip_install --no-build-isolation .
 fi
 
 # Remove (potentially invalid) star import caches.

build/pkgs/sagemath_bliss/spkg-install.in

@@ -10,9 +10,6 @@ if [ "$SAGE_EDITABLE" = yes ]; then
         sdh_setup_bdist_wheel && sdh_store_wheel .
     fi
 else
-    if [ "$SAGE_WHEELS" = yes ]; then
-        # Modularized install via wheels
-        sdh_pip_install .
-    # else nothing to do in legacy direct installation.
-    fi
+    # Modularized install via wheels. Now implied: "$SAGE_WHEELS" = yes
+    sdh_pip_install .
 fi

build/pkgs/sagemath_coxeter3/spkg-install.in

@@ -0,0 +1 @@
+../sagemath_bliss/spkg-install.in

build/pkgs/sagemath_mcqd/spkg-install.in

@@ -0,0 +1 @@
+../sagemath_bliss/spkg-install.in

build/pkgs/sagemath_meataxe/spkg-install.in

@@ -0,0 +1 @@
+../sagemath_bliss/spkg-install.in

build/pkgs/sagemath_sirocco/spkg-install.in

@@ -0,0 +1 @@
+../sagemath_bliss/spkg-install.in

build/pkgs/sagemath_tdlib/spkg-install.in

@@ -0,0 +1 @@
+../sagemath_bliss/spkg-install.in

configure.ac

@@ -135,8 +135,19 @@ AC_ARG_ENABLE([editable],
 AC_ARG_ENABLE([wheels],
               [AS_HELP_STRING([--enable-wheels],
                               [build wheels for the Sage library and update them on "sage -b"; if disabled, use "make wheels" to build wheels])],
-              [AC_SUBST([SAGE_WHEELS], [$enableval])],
-              [])
+              [dnl
+                 AS_VAR_IF([SAGE_EDITABLE], [yes], [dnl
+                 ], [dnl
+                   AC_MSG_NOTICE([direct installation of the Sage library (--disable-editable --disable-wheels) is no longer supported; ignoring --disable-wheels])
+                 ])
+                 AC_SUBST([SAGE_WHEELS], [$enableval])
+              ], [dnl
+                 AS_VAR_IF([SAGE_EDITABLE], [yes], [dnl
+                   AC_SUBST([SAGE_WHEELS], [no])
+                 ], [dnl
+                   AC_SUBST([SAGE_WHEELS], [yes])
+                 ])
+              ])
 
 # Check whether we are on a supported platform
 AC_CANONICAL_BUILD()

pkgs/sagemath-standard/setup.py

@@ -52,12 +52,12 @@
 
 from sage_setup.command.sage_build_cython import sage_build_cython
 from sage_setup.command.sage_build_ext import sage_build_ext
-from sage_setup.command.sage_install import sage_develop, sage_install_and_clean
+from sage_setup.command.sage_install import sage_develop, sage_install
 
 cmdclass = dict(build_cython=sage_build_cython,
                 build_ext=sage_build_ext,
                 develop=sage_develop,
-                install=sage_install_and_clean)
+                install=sage_install)
 
 #########################################################
 ### Discovering Sources