Merge #33851

.github/workflows/doc-build.yml

@@ -21,9 +21,10 @@ jobs:
 
       - name: Prepare
         run: |
-          # Reuse built SAGE_LOCAL contained in the Docker image 
+          # Reuse built SAGE_LOCAL contained in the Docker image
           ./bootstrap
           ./configure --enable-build-as-root --prefix=/sage/local --with-sage-venv --enable-download-from-upstream-url
+          make furo
 
       - name: Build
         run: make doc-html

.zenodo.json

@@ -1,10 +1,10 @@
 {
     "description": "Mirror of the Sage https://sagemath.org/ source tree", 
     "license": "other-open", 
-    "title": "sagemath/sage: 9.7.beta7", 
-    "version": "9.7.beta7", 
+    "title": "sagemath/sage: 9.7.beta8", 
+    "version": "9.7.beta8", 
     "upload_type": "software", 
-    "publication_date": "2022-08-01", 
+    "publication_date": "2022-08-07", 
     "creators": [
         {
             "affiliation": "SageMath.org", 
@@ -15,7 +15,7 @@
     "related_identifiers": [
         {
             "scheme": "url", 
-            "identifier": "https://github.com/sagemath/sage/tree/9.7.beta7", 
+            "identifier": "https://github.com/sagemath/sage/tree/9.7.beta8", 
             "relation": "isSupplementTo"
         }, 
         {

README.md

@@ -269,8 +269,8 @@ in the Installation Guide.
     [void.txt](build/pkgs/_prereq/distros/void.txt), or visit
     https://doc.sagemath.org/html/en/reference/spkg/_prereq.html#spkg-prereq
 
-4.  [Git] If you plan to work with ticket branches that make changes
-    to packages, install the bootstrapping prerequisites. See the
+4.  [Git] If you plan to do Sage development or otherwise work with ticket branches
+    and not only releases, install the bootstrapping prerequisites. See the
     files in the folder
     [build/pkgs/_bootstrap/distros](build/pkgs/_bootstrap/distros), or
     visit

VERSION.txt

@@ -1 +1 @@
-SageMath version 9.7.beta7, Release Date: 2022-08-01
+SageMath version 9.7.beta8, Release Date: 2022-08-07

bootstrap

@@ -79,7 +79,7 @@ SAGE_SPKG_CONFIGURE_$(echo ${pkgname} | tr '[a-z]' '[A-Z]')"
             if test -f "$DIR/spkg-install"; then
                 SPKG_SOURCE=script
             else
-                # a dummy script package
+                # a dummy package
                 SPKG_SOURCE=none
             fi
         else

bootstrap-conda

@@ -7,15 +7,17 @@
 export PATH="$(pwd)/build/bin:$PATH"
 
 STRIP_COMMENTS="sed s/#.*//;"
-RECOMMENDED_SPKG_PATTERN="@(_recommended$(for a in $(head -n 1 build/pkgs/_recommended/dependencies); do echo -n "|"$a; done))"
-DEVELOP_SPKG_PATTERN="git_trac_command"
+
+shopt -s extglob
+
+DEVELOP_SPKG_PATTERN="@(_develop$(for a in $(head -n 1 build/pkgs/_develop/dependencies); do echo -n "|"$a; done))"
 
 BOOTSTRAP_PACKAGES=$(echo $(${STRIP_COMMENTS} build/pkgs/_bootstrap/distros/conda.txt))
 SYSTEM_PACKAGES=
 OPTIONAL_SYSTEM_PACKAGES=
 SAGELIB_SYSTEM_PACKAGES=
 SAGELIB_OPTIONAL_SYSTEM_PACKAGES=
-RECOMMENDED_SYSTEM_PACKAGES=
+DEVELOP_SYSTEM_PACKAGES=
 for PKG_BASE in $(sage-package list --has-file distros/conda.txt); do
     PKG_SCRIPTS=build/pkgs/$PKG_BASE
     SYSTEM_PACKAGES_FILE=$PKG_SCRIPTS/distros/conda.txt
@@ -27,8 +29,8 @@ for PKG_BASE in $(sage-package list --has-file distros/conda.txt); do
                 *:standard)
                     SYSTEM_PACKAGES+=" $PKG_SYSTEM_PACKAGES"
                     ;;
-                $RECOMMENDED_SPKG_PATTERN:*)
-                    RECOMMENDED_SYSTEM_PACKAGES+=" $PKG_SYSTEM_PACKAGES"
+                $DEVELOP_SPKG_PATTERN:*)
+                    DEVELOP_SYSTEM_PACKAGES+=" $PKG_SYSTEM_PACKAGES"
                     ;;
                 *)
                     OPTIONAL_SYSTEM_PACKAGES+=" $PKG_SYSTEM_PACKAGES"
@@ -70,7 +72,6 @@ echo >&2 $0:$LINENO: generate conda environment files
     done
 ) > src/environment.yml
 
-DEVELOP_SYSTEM_PACKAGES="openssh pycodestyle pytest"
 (
     sed 's/name: sage/name: sage-dev/' src/environment.yml
     echo "  # Additional dev tools"

build/bin/sage-spkg-info

@@ -49,9 +49,6 @@ for dep_file in dependencies dependencies_order_only; do
         done
     fi
 done
-if [ -z "$dep" ]; then
-    echo "None"
-fi
 echo
 echo "Version Information"
 echo "-------------------"

build/make/Makefile.in

@@ -650,10 +650,11 @@ $(1)-$(4)-no-deps:
 		SAGE_SPKG_WHEELS=$$($(4))/var/lib/sage/wheels \
 		SAGE_INST_LOCAL=$$($(4)) \
 		sage-logger -p '$$(SAGE_ROOT)/build/pkgs/$(1)/spkg-install' '$$(SAGE_LOGS)/$(1)-$(2).log' && \
+	    rm -f "$$($(4))/$(SPKG_INST_RELDIR)/$(1)-*" && \
 	    touch "$$($(4))/$(SPKG_INST_RELDIR)/$(1)-$(2)"; \
 	else ( \
 	    echo; \
-	    echo "Note: $(1) is a dummy script package that the Sage distribution uses"; \
+	    echo "Note: $(1) is a dummy package that the Sage distribution uses"; \
 	    echo "to provide information about equivalent system packages."; \
 	    echo "It cannot be installed using the Sage distribution."; \
 	    echo "Please install it manually, for example using the system packages"; \
@@ -662,7 +663,7 @@ $(1)-$(4)-no-deps:
 	    echo; \
 	    $$(SAGE_ROOT)/build/bin/sage-spkg-info $(1); \
 	    echo; \
-	    echo "Error: $(1) is a dummy script package and "; \
+	    echo "Error: $(1) is a dummy package and "; \
 	    echo "cannot be installed using the Sage distribution." ) | sage-logger -p 'cat; exit 1' '$$(SAGE_LOGS)/$(1)-$(2).log'; \
 	fi
 

build/pkgs/_develop/SPKG.rst

@@ -0,0 +1,7 @@
+\_develop: Represents system packages recommended for development
+=================================================================
+
+Description
+-----------
+
+Script package representing a list of system packages recommended for developers.

build/pkgs/_develop/dependencies

@@ -0,0 +1 @@
+_bootstrap git pytest pytest_xdist

build/pkgs/_develop/distros/alpine.txt

@@ -0,0 +1,2 @@
+gnupg-gpgconf
+openssh-client

build/pkgs/_develop/distros/arch.txt

@@ -0,0 +1,2 @@
+gnupg
+openssh

build/pkgs/_develop/distros/conda.txt

@@ -0,0 +1,3 @@
+openssh
+pycodestyle
+esbonio

build/pkgs/_develop/distros/cygwin.txt

@@ -0,0 +1 @@
+gnupg2

build/pkgs/_develop/distros/debian.txt

@@ -0,0 +1,4 @@
+# Needed for devcontainer support in VS code
+gpgconf
+openssh-client
+openssh

build/pkgs/_develop/distros/fedora.txt

@@ -0,0 +1,2 @@
+gnupg2
+openssh

build/pkgs/_develop/distros/freebsd.txt

@@ -0,0 +1,2 @@
+security/gnupg
+security/openssh-portable

build/pkgs/_develop/distros/gentoo.txt

@@ -0,0 +1,2 @@
+app-crypt/gnupg
+net-misc/openssh

build/pkgs/_develop/distros/homebrew.txt

@@ -0,0 +1 @@
+gnupg

build/pkgs/_develop/distros/macports.txt

@@ -0,0 +1 @@
+gnupg2

build/pkgs/_develop/distros/nix.txt

@@ -0,0 +1,2 @@
+gnupg
+openssh

build/pkgs/_develop/distros/opensuse.txt

@@ -0,0 +1,2 @@
+gpg2
+openssh

build/pkgs/_develop/distros/repology.txt

@@ -0,0 +1,2 @@
+gnupg
+openssh

build/pkgs/_develop/distros/slackware.txt

@@ -0,0 +1,2 @@
+gnupg2
+openssh

build/pkgs/_develop/distros/void.txt

@@ -0,0 +1,2 @@
+gnupg2
+openssh

build/pkgs/_develop/spkg-configure.m4

@@ -0,0 +1,3 @@
+SAGE_SPKG_CONFIGURE([_develop], [
+  sage_spkg_install__develop=yes
+])

build/pkgs/_develop/spkg-install

@@ -0,0 +1,2 @@
+#! /usr/bin/env bash
+# Nothing to do

build/pkgs/_develop/type

@@ -0,0 +1 @@
+optional

build/pkgs/_sagemath/SPKG.rst

@@ -0,0 +1,15 @@
+_sagemath: Downstream package of Sage in distributions
+======================================================
+
+SageMath is available from various distributions and can be installed
+by package managers.
+
+This dummy package records the names of the system packages that
+should be installed to provide a standard installation of SageMath,
+including documentation and Jupyter.
+
+
+Downstream Contact
+------------------
+
+See :trac:`Trac wiki page Distribution <wiki/Distribution>`

build/pkgs/_sagemath/distros/arch.txt

@@ -0,0 +1 @@
+sagemath sagemath-doc

build/pkgs/_sagemath/distros/conda.txt

@@ -0,0 +1 @@
+sage

build/pkgs/_sagemath/distros/debian.txt

@@ -0,0 +1,3 @@
+sagemath
+sagemath-doc-en
+sagemath-jupyter

build/pkgs/_sagemath/distros/fedora.txt

@@ -0,0 +1 @@
+sagemath

build/pkgs/_sagemath/distros/freebsd.txt

@@ -0,0 +1 @@
+math/sage

build/pkgs/_sagemath/distros/homebrew.txt

@@ -0,0 +1 @@
+sage

build/pkgs/_sagemath/distros/nix.txt

@@ -0,0 +1 @@
+sage

build/pkgs/_sagemath/distros/repology.txt

@@ -0,0 +1 @@
+sagemath

build/pkgs/_sagemath/distros/void.txt

@@ -0,0 +1 @@
+sagemath

build/pkgs/_sagemath/type

@@ -0,0 +1 @@
+optional

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=4990a91b1c7cd53d82c6f7bbfc5bef6fa8db4343
-md5=fdda24ab1c082707991f319419057d77
-cksum=640816463
+sha1=0a748ea2730e013555fd8ea78bc76787290cc43f
+md5=82d386f0395c2a38fc23964bd40b2cfc
+cksum=2236984653

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-c94df557112150bfba730df6413f11cb2e467a2a
+a3be8106604ed6a2c1d7d119e67674e3166a6eec

build/pkgs/cvxopt/checksums.ini

@@ -1,5 +1,5 @@
 tarball=cvxopt-VERSION.tar.gz
-sha1=18cd006e45f8b10c8724d835a30cf1210bd685b1
-md5=af758ea38fcdd5cc1c102df4d378ffc3
-cksum=876134541
+sha1=7118b2c490a6596a47049c8ae6e15b3568239cb8
+md5=d94895acf6f41806b482791174e9d0e7
+cksum=2569244181
 upstream_url=https://pypi.io/packages/source/c/cvxopt/cvxopt-VERSION.tar.gz

build/pkgs/cvxopt/package-version.txt

@@ -1 +1 @@
-1.2.7
+1.3.0

build/pkgs/cython/checksums.ini

@@ -1,5 +1,5 @@
 tarball=Cython-VERSION.tar.gz
-sha1=89c8413689f06c999caf4700fb8bab53ba6f860a
-md5=3cf4001b4be42a263f163865235c39d8
-cksum=2022900074
+sha1=015b737107304a5777f5c6552ffb12713684c924
+md5=91c36ea86c00adcc5c1c11cf48b733c0
+cksum=1793363471
 upstream_url=https://pypi.io/packages/source/C/Cython/Cython-VERSION.tar.gz

build/pkgs/cython/package-version.txt

@@ -1 +1 @@
-0.29.30
+0.29.32

build/pkgs/plantri/checksums.ini

@@ -1,5 +1,5 @@
-tarball=plantri52.tar.gz
-sha1=91efef7b688977158d65b51879d07e691c5b321f
-md5=a042b3da1db2daa346ba8491ae94062b
-cksum=119008801
-upstream_url=https://users.cecs.anu.edu.au/~bdm/plantri/plantri52.tar.gz
+tarball=plantri53.tar.gz
+sha1=a04aec2fa90c43f1c9bef59d041a54d8fa5bf562
+md5=ea765b3508dd56384f94ad1f032e2dd4
+cksum=3200215885
+upstream_url=https://users.cecs.anu.edu.au/~bdm/plantri/plantri53.tar.gz

build/pkgs/plantri/package-version.txt

@@ -1 +1 @@
-5.2
+5.3

build/pkgs/sage_conf/install-requires.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sage-conf ~= 9.7b7
+sage-conf ~= 9.7b8

build/pkgs/sage_docbuild/install-requires.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sage-docbuild ~= 9.7b7
+sage-docbuild ~= 9.7b8

build/pkgs/sage_setup/install-requires.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sage-setup ~= 9.7b7
+sage-setup ~= 9.7b8

build/pkgs/sage_sws2rst/install-requires.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sage-sws2rst ~= 9.7b7
+sage-sws2rst ~= 9.7b8

build/pkgs/sagelib/install-requires.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagelib ~= 9.7b7
+sagelib ~= 9.7b8

build/pkgs/sagelib/spkg-install

@@ -3,6 +3,10 @@ if [ "$SAGE_EDITABLE" = yes ]; then
     cd "$SAGE_SRC"
 else
     cd src
+    # Trac #34181: Do not allow scripts with shebang lines from old
+    # venvs leak into new venvs. (Changes only seem to be necessary
+    # for non-editable builds.)
+    rm -rf build/scripts-*
 fi
 ## All sagelib-building is done by setup.py.
 ## This is so that sagelib can be installed by standard Python procedures,
@@ -26,13 +30,16 @@ export SAGE_BUILD_DIR=/doesnotexist
 export PYTHON="$SAGE_LOCAL/bin/python3"
 
 # We also poison all directories below SAGE_LOCAL.
-
-export SAGE_LOCAL=/doesnotexist
 export SAGE_PKGCONFIG=/doesnotexist
-export SAGE_PKG_CONFIG_PATH=/doesnotexist
 export SAGE_SPKG_SCRIPTS=/doesnotexist
 export SAGE_SHARE=/doesnotexist
 
+# However, we only unset SAGE_LOCAL and SAGE_PKG_CONFIG_PATH.
+# sage_setup.setenv receives them from sage_conf via sage.env;
+# the poisoned environment variables would override them.
+unset SAGE_LOCAL
+unset SAGE_PKG_CONFIG_PATH
+
 # Trac #30903: We cannot poison SAGE_DOC because setup.py installs the Jupyter kernel
 # spec, which includes setting a symlink to the installed documentation.
 # export SAGE_DOC=/doesnotexist
@@ -60,5 +67,5 @@ fi
 rm -rf build/temp.*
 
 if [ "$UNAME" = "CYGWIN" ]; then
-    sage-rebase.sh "$SAGE_LOCAL" 2>/dev/null;
+    sage-rebase.sh "$SAGE_VENV" 2>/dev/null;
 fi

build/pkgs/sagemath_categories/install-requires.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-categories ~= 9.7b7
+sagemath-categories ~= 9.7b8

build/pkgs/sagemath_environment/install-requires.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-environment ~= 9.7b7
+sagemath-environment ~= 9.7b8

build/pkgs/sagemath_objects/install-requires.txt

@@ -1,2 +1,2 @@
 # This file is updated on every release by the sage-update-version script
-sagemath-objects ~= 9.7b7
+sagemath-objects ~= 9.7b8