Modularization of sagelib: Break out a separate package sagemath-standard-no-symbolics

build/pkgs/sagemath_standard_no_symbolics/SPKG.rst

@@ -0,0 +1 @@
+src/README.rst

build/pkgs/sagemath_standard_no_symbolics/bootstrap

@@ -0,0 +1 @@
+../sagelib/bootstrap

build/pkgs/sagemath_standard_no_symbolics/dependencies

@@ -0,0 +1,9 @@
+FORCE $(SCRIPTS) arb boost_cropped $(BLAS) brial cliquer cypari cysignals cython eclib ecm flint fplll fpylll libgd gap givaro glpk gmpy2 gsl iml jinja2 jupyter_core lcalc lrcalc_python libbraiding libhomfly libpng linbox m4ri m4rie memory_allocator mpc mpfi mpfr $(MP_LIBRARY) ntl numpy pari pip pkgconfig planarity ppl pplpy primesieve primecount primecountpy pycygwin $(PYTHON) requests rw sage_conf singular symmetrica $(PCFILES) | $(PYTHON_TOOLCHAIN) sage_setup
+
+----------
+All lines of this file are ignored except the first.
+
+The above are the *build-time* dependencies of the Sage library.  These are,
+on the one hand, programs needed for the build/install process of the
+Sage library (e.g. CYTHON, JINJA2), and on the other hand all
+dependencies for Cython files (e.g. PARI, NTL, MP_LIBRARY).

build/pkgs/sagemath_standard_no_symbolics/dependencies_check

@@ -0,0 +1 @@
+tox

build/pkgs/sagemath_standard_no_symbolics/install-requires.txt

@@ -0,0 +1 @@
+sagemath-standard-no-symbolics

build/pkgs/sagemath_standard_no_symbolics/package-version.txt

@@ -0,0 +1 @@
+../sagelib/package-version.txt

build/pkgs/sagemath_standard_no_symbolics/spkg-install

@@ -0,0 +1 @@
+../sagemath_objects/spkg-install

build/pkgs/sagemath_standard_no_symbolics/spkg-src

@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+#
+# Script to prepare an sdist tarball.
+# This script is not used during build.
+#
+# HOW TO MAKE THE TARBALL:
+# ./sage --sh build/pkgs/sagemath_standard_no_symbolics/spkg-src
+
+if [ -z "$SAGE_ROOT" ] ; then
+    echo >&2 "Error - SAGE_ROOT undefined ... exiting"
+    echo >&2 "Maybe run 'sage -sh'?"
+    exit 1
+fi
+
+# Exit on failure
+set -e
+
+cd build/pkgs/sagemath_standard_no_symbolics
+
+cd src
+python3 -u setup.py --no-user-cfg sdist --dist-dir "$SAGE_DISTFILES"

build/pkgs/sagemath_standard_no_symbolics/src

@@ -0,0 +1 @@
+../../../pkgs/sagemath-standard-no-symbolics

build/pkgs/sagemath_standard_no_symbolics/type

@@ -0,0 +1 @@
+experimental

pkgs/sagemath-categories/tox.ini

@@ -1,23 +1,23 @@
 # To build and test in the tox environment:
 #
-# ./sage -sh -c '(cd pkgs/sagemath-categories && tox -v -v -v -e sagepython)'
+# make SAGE_WHEELS=yes sagemath_categories-build-deps && ./sage -sh -c '(cd pkgs/sagemath-categories && SAGE_NUM_THREADS=8 tox -v -v -v -e sagepython-sagewheels-nopypi-norequirements)'
 #
-# To test interactively:
+# After this, to test interactively:
 #
-# pkgs/sagemath-categories/.tox/sagepython/bin/python
+#   pkgs/sagemath-categories/.tox/sagepython-sagewheels-nopypi-norequirements/bin/sage
 #
 [tox]
 envlist =
-    sagepython-norequirements
+    sagepython-sagewheels-nopypi-norequirements
 
-[testenv]
-deps =
-    !norequirements: -rrequirements.txt
-    # tox 3.x does not handle extras when using --installpkg. https://github.com/tox-dev/tox/issues/1576
-    sagemath-repl
-
-extras = test
+requires =
+    # Auto-provision a modern tox.
+    # [pkgenv] added in 4.2 - https://tox.wiki/en/latest/upgrading.html#packaging-configuration-and-inheritance
+    tox>=4.2
 
+[pkgenv]
+# Environment in which to build the sdist.
+# https://tox.wiki/en/latest/upgrading.html#packaging-environments
 passenv =
     # Variables set by .homebrew-build-env
                              CPATH
@@ -32,36 +32,73 @@ passenv =
     sagewheels:              SAGE_SPKG_WHEELS
 
 setenv =
-    # Sage scripts such as sage-runtests like to use $HOME/.sage
-                             HOME={envdir}
     # We supply pip options by environment variables so that they
     # apply both to the installation of the dependencies and of the package
     sagewheels:              PIP_FIND_LINKS=file://{env:SAGE_SPKG_WHEELS:{env:SAGE_VENV:{toxinidir}/../../../../venv}/var/lib/sage/wheels}
     nopypi:                  PIP_NO_INDEX=true
 
+[testenv]
+deps =
+    !norequirements:         -rrequirements.txt
+
+extras = test
+
+passenv =                    {[pkgenv]passenv}
+
+setenv =                     {[pkgenv]setenv}
+    # Sage scripts such as sage-runtests like to use $HOME/.sage
+                             HOME={envdir}
+
 allowlist_externals =
     bash
 
 commands =
-    # Beware of the treacherous non-src layout. "./sage/" shadows the install sage package.
+    # Beware of the treacherous non-src layout. "./sage/" shadows the installed sage package.
     {envpython} -c 'import sys; "" in sys.path and sys.path.remove(""); import sage.cpython.builtin_types, sage.cpython.cython_metaclass, sage.cpython.debug, sage.structure.all, sage.categories.all'
 
     # Test that importing sage.categories.all initializes categories
     {envpython} -c 'import sys; "" in sys.path and sys.path.remove(""); from sage.categories.all import *; SimplicialComplexes(); FunctionFields()'
 
-    bash -c 'cd {temp_dir} && SAGE_SRC=$(python -c "from sage.env import SAGE_SRC; print(SAGE_SRC)") && sage-runtests --initial --environment=sage.all__sagemath_categories --optional=sage $SAGE_SRC/sage/structure  || echo "(lots of doctest failures are expected)"'
+    bash -c 'cd $(python -c "import sys; \"\" in sys.path and sys.path.remove(\"\"); from sage.env import SAGE_LIB; print(SAGE_LIB)") \
+        && sage-runtests -p --initial --environment=sage.all__sagemath_categories --optional=sage sage/structure  || echo "(lots of doctest failures are expected)"'
+
+[testenv:.tox]
+# Allow access to PyPI for auto-provisioning a suitable tox version
+passenv =
+setenv =                     PIP_NO_INDEX=false
+
+[testenv:.pkg-sagepython]
+# Environment in which to build the sdist.
+# inherits from [pkgenv] - https://tox.wiki/en/latest/upgrading.html#packaging-environments
+basepython = {env:SAGE_VENV}/bin/python3
+
+[testenv:.pkg-sagepython-sagewheels-nopypi]
+passenv =                    {[pkgenv]passenv}
+                             SAGE_VENV
+                             SAGE_SPKG_WHEELS
+
+setenv =                     {[pkgenv]setenv}
+                             PIP_FIND_LINKS=file://{env:SAGE_SPKG_WHEELS:{env:SAGE_VENV:{toxinidir}/../../../../venv}/var/lib/sage/wheels}
+                             PIP_NO_INDEX=true
+
+basepython = {env:SAGE_VENV}/bin/python3
 
 [testenv:sagepython]
 basepython = {env:SAGE_VENV}/bin/python3
+package_env = .pkg-sagepython
 
 [testenv:sagepython-sagewheels-nopypi]
 basepython = {env:SAGE_VENV}/bin/python3
+package_env = .pkg-sagepython-sagewheels-nopypi
 
 [testenv:sagepython-sagewheels-nopypi-norequirements]
 basepython = {env:SAGE_VENV}/bin/python3
+package_env = .pkg-sagepython-sagewheels-nopypi
 
 [testenv:sagepython-sagewheels]
-basepython = {env:SAGE_VENV}/bin/python3
+basepython = {env:SAGE_VENV}/bin/python
+package_env = .pkg-sagepython
 
 [testenv:sagepython-norequirements]
 basepython = {env:SAGE_VENV}/bin/python3
+package_env = .pkg-sagepython

pkgs/sagemath-environment/tox.ini

@@ -1,22 +1,28 @@
 # To build and test in the tox environment:
 #
-# ./sage -sh -c '(cd pkgs/sagemath-environment && tox -v -v -e sagepython)'
+# ./sage -sh -c '(cd pkgs/sagemath-environment && tox -v -v -e sagepython-norequirements)'
 #
 # To test interactively:
 #
-# pkgs/sagemath-environment/.tox/sagepython/bin/python
+# pkgs/sagemath-environment/.tox/sagepython-norequirements/bin/python
 #
 [tox]
 envlist =
     sagepython-norequirements
 
-isolated_build = True
-
-[testenv]
-deps =
-    !norequirements: -rrequirements.txt
+requires =
+    # Auto-provision a modern tox.
+    # [pkgenv] added in 4.2 - https://tox.wiki/en/latest/upgrading.html#packaging-configuration-and-inheritance
+    tox>=4.2
 
+[pkgenv]
+# Environment in which to build the sdist.
+# https://tox.wiki/en/latest/upgrading.html#packaging-environments
 passenv =
+    # Variables set by .homebrew-build-env
+                             CPATH
+                             LIBRARY_PATH
+                             PKG_CONFIG_PATH
     # Parallel build
                              SAGE_NUM_THREADS
                              SAGE_NUM_THREADS_PARALLEL
@@ -26,31 +32,67 @@ passenv =
     sagewheels:              SAGE_SPKG_WHEELS
 
 setenv =
-    # Sage scripts such as sage-runtests like to use $HOME/.sage
-                             HOME={envdir}
     # We supply pip options by environment variables so that they
     # apply both to the installation of the dependencies and of the package
     sagewheels:              PIP_FIND_LINKS=file://{env:SAGE_SPKG_WHEELS:{env:SAGE_VENV:{toxinidir}/../../../../venv}/var/lib/sage/wheels}
     nopypi:                  PIP_NO_INDEX=true
 
+[testenv]
+deps =
+    !norequirements:         -rrequirements.txt
+
+extras = test
+
+passenv =                    {[pkgenv]passenv}
+
+setenv =                     {[pkgenv]setenv}
+    # Sage scripts such as sage-runtests like to use $HOME/.sage
+                             HOME={envdir}
+
 allowlist_externals =
     bash
 
 commands =
     # Beware of the treacherous non-src layout. "./sage/" shadows the installed sage package.
     {envpython} -c 'import sys; "" in sys.path and sys.path.remove(""); from sage.features.all import all_features; print(sorted(all_features(), key=lambda x: x.name)); import sage.misc.package'
 
+[testenv:.tox]
+# Allow access to PyPI for auto-provisioning a suitable tox version
+passenv =
+setenv =                     PIP_NO_INDEX=false
+
+[testenv:.pkg-sagepython]
+# Environment in which to build the sdist.
+# inherits from [pkgenv] - https://tox.wiki/en/latest/upgrading.html#packaging-environments
+basepython = {env:SAGE_VENV}/bin/python3
+
+[testenv:.pkg-sagepython-sagewheels-nopypi]
+passenv =                    {[pkgenv]passenv}
+                             SAGE_VENV
+                             SAGE_SPKG_WHEELS
+
+setenv =                     {[pkgenv]setenv}
+                             PIP_FIND_LINKS=file://{env:SAGE_SPKG_WHEELS:{env:SAGE_VENV:{toxinidir}/../../../../venv}/var/lib/sage/wheels}
+                             PIP_NO_INDEX=true
+
+basepython = {env:SAGE_VENV}/bin/python3
+
 [testenv:sagepython]
 basepython = {env:SAGE_VENV}/bin/python3
+package_env = .pkg-sagepython
 
 [testenv:sagepython-sagewheels-nopypi]
 basepython = {env:SAGE_VENV}/bin/python3
+package_env = .pkg-sagepython-sagewheels-nopypi
 
 [testenv:sagepython-sagewheels-nopypi-norequirements]
 basepython = {env:SAGE_VENV}/bin/python3
+package_env = .pkg-sagepython-sagewheels-nopypi
 
 [testenv:sagepython-sagewheels]
-basepython = {env:SAGE_VENV}/bin/python3
+basepython = {env:SAGE_VENV}/bin/python
+package_env = .pkg-sagepython
 
 [testenv:sagepython-norequirements]
 basepython = {env:SAGE_VENV}/bin/python3
+package_env = .pkg-sagepython

pkgs/sagemath-objects/tox.ini

@@ -1,21 +1,23 @@
 # To build and test in the tox environment:
 #
-# ./sage -sh -c '(cd pkgs/sagemath-objects && tox -v -v -e sagepython)'
+# ./sage -sh -c '(cd pkgs/sagemath-objects && SAGE_NUM_THREADS=8 tox -v -v -e sagepython-norequirements)'
 #
-# To test interactively:
+# After this, to test interactively:
 #
-# pkgs/sagemath-objects/.tox/sagepython/bin/python
+# pkgs/sagemath-objects/.tox/sagepython-norequirements/bin/python
 #
 [tox]
 envlist =
     sagepython-norequirements
 
-[testenv]
-deps =
-    !norequirements: -rrequirements.txt
-
-extras = test
+requires =
+    # Auto-provision a modern tox.
+    # [pkgenv] added in 4.2 - https://tox.wiki/en/latest/upgrading.html#packaging-configuration-and-inheritance
+    tox>=4.2
 
+[pkgenv]
+# Environment in which to build the sdist.
+# https://tox.wiki/en/latest/upgrading.html#packaging-environments
 passenv =
     # Variables set by .homebrew-build-env
                              CPATH
@@ -30,13 +32,23 @@ passenv =
     sagewheels:              SAGE_SPKG_WHEELS
 
 setenv =
-    # Sage scripts such as sage-runtests like to use $HOME/.sage
-                             HOME={envdir}
     # We supply pip options by environment variables so that they
     # apply both to the installation of the dependencies and of the package
     sagewheels:              PIP_FIND_LINKS=file://{env:SAGE_SPKG_WHEELS:{env:SAGE_VENV:{toxinidir}/../../../../venv}/var/lib/sage/wheels}
     nopypi:                  PIP_NO_INDEX=true
 
+[testenv]
+deps =
+    !norequirements:         -rrequirements.txt
+
+extras = test
+
+passenv =                    {[pkgenv]passenv}
+
+setenv =                     {[pkgenv]setenv}
+    # Sage scripts such as sage-runtests like to use $HOME/.sage
+                             HOME={envdir}
+
 allowlist_externals =
     bash
 
@@ -48,17 +60,43 @@ commands =
 
     #bash -c 'cd {temp_dir} && SAGE_SRC=$(python -c "from sage.env import SAGE_SRC; print(SAGE_SRC)") && sage-runtests --environment=sage.all__sagemath_objects --initial --optional=sage $SAGE_SRC/sage/structure || echo "(lots of doctest failures are expected)"'
 
+[testenv:.tox]
+# Allow access to PyPI for auto-provisioning a suitable tox version
+passenv =
+setenv =                     PIP_NO_INDEX=false
+
+[testenv:.pkg-sagepython]
+# Environment in which to build the sdist.
+# inherits from [pkgenv] - https://tox.wiki/en/latest/upgrading.html#packaging-environments
+basepython = {env:SAGE_VENV}/bin/python3
+
+[testenv:.pkg-sagepython-sagewheels-nopypi]
+passenv =                    {[pkgenv]passenv}
+                             SAGE_VENV
+                             SAGE_SPKG_WHEELS
+
+setenv =                     {[pkgenv]setenv}
+                             PIP_FIND_LINKS=file://{env:SAGE_SPKG_WHEELS:{env:SAGE_VENV:{toxinidir}/../../../../venv}/var/lib/sage/wheels}
+                             PIP_NO_INDEX=true
+
+basepython = {env:SAGE_VENV}/bin/python3
+
 [testenv:sagepython]
 basepython = {env:SAGE_VENV}/bin/python3
+package_env = .pkg-sagepython
 
 [testenv:sagepython-sagewheels-nopypi]
 basepython = {env:SAGE_VENV}/bin/python3
+package_env = .pkg-sagepython-sagewheels-nopypi
 
 [testenv:sagepython-sagewheels-nopypi-norequirements]
 basepython = {env:SAGE_VENV}/bin/python3
+package_env = .pkg-sagepython-sagewheels-nopypi
 
 [testenv:sagepython-sagewheels]
-basepython = {env:SAGE_VENV}/bin/python3
+basepython = {env:SAGE_VENV}/bin/python
+package_env = .pkg-sagepython
 
 [testenv:sagepython-norequirements]
 basepython = {env:SAGE_VENV}/bin/python3
+package_env = .pkg-sagepython