Merge branch 'develop' into t/33950/public/rings/free_multigraded_res…

…olutions-33950

.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"
         }, 
         {

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

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/_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/furo/distros/conda.txt

@@ -0,0 +1 @@
+furo

build/pkgs/ipympl/distros/conda.txt

@@ -0,0 +1 @@
+ipympl

build/pkgs/jupyter_packaging/distros/conda.txt

@@ -0,0 +1 @@
+jupyter-packaging

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/pyppeteer/distros/conda.txt

@@ -0,0 +1 @@
+pyppeteer

build/pkgs/retrolab/distros/conda.txt

@@ -0,0 +1 @@
+retrolab

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

build/pkgs/sirocco/distros/conda.txt

@@ -0,0 +1 @@
+sirocco

build/pkgs/sirocco/distros/fedora.txt

@@ -0,0 +1 @@
+sirocco

m4/sage_spkg_collect.m4

@@ -172,7 +172,7 @@ AC_DEFUN([SAGE_SPKG_FINALIZE], [dnl
     m4_case(SPKG_SOURCE,
       [normal], [dnl
         m4_define([in_sdist], [yes])dnl
-      ], [dnl pip/script/none (dummy script package)
+      ], [dnl pip/script/none (dummy package)
         dnl Since pip packages are downloaded and installed by pip, we do not
         dnl include them in the source tarball. At the time of this writing,
         dnl all pip packages are optional.
@@ -197,33 +197,58 @@ AC_DEFUN([SAGE_SPKG_FINALIZE], [dnl
     SAGE_PACKAGE_TREES="${SAGE_PACKAGE_TREES}$(printf '\ntrees_')SPKG_NAME = SPKG_TREE_VAR"
 
     dnl Determine whether it is installed already
+    AS_VAR_SET([SPKG_INSTALLED_VERSION], [])
     AS_VAR_SET([is_installed], [no])
     m4_append_uniq_w([SPKG_TREE_VAR], [SAGE_LOCAL])
     for treevar in SPKG_TREE_VAR; do
         AS_VAR_COPY([t], [$treevar])
+        dnl SAGE_VENV contains the literal ${SAGE_LOCAL}, eval it
+        t=$(eval echo $t)
         AS_IF([test -n "$t" -a -d "$t/var/lib/sage/installed/" ], [dnl
             for f in "$t/var/lib/sage/installed/SPKG_NAME"-*; do
                 AS_IF([test -r "$f"], [dnl
-                    m4_case(SPKG_SOURCE, [normal], [dnl
-                        dnl Only run the multiple installation record test for normal packages,
-                        dnl not for script packages. We actually do not clean up after those...
-                        AS_IF([test "$is_installed" = "yes"], [dnl
+                    AS_IF([test "$is_installed" = "yes"], [dnl
+                        m4_case(SPKG_SOURCE, [normal], [dnl
+                            dnl Only issue the multiple installation record test for normal packages,
+                            dnl not for script packages.
                             AC_MSG_ERROR(m4_normalize([
                                 multiple installation records for SPKG_NAME:
                                 m4_newline($(ls -l "$t/var/lib/sage/installed/SPKG_NAME"-*))
                                 m4_newline([only one should exist, so please delete some or all
                                 of these files and re-run "$srcdir/configure"])
-                            ]))dnl
+                            ]))
+                        ], [dnl
+                            dnl Before #34193, we did not remove old installation records of
+                            dnl script packages. So no error.
+                            AS_VAR_SET([spkg_installed_version_text], ["SPKG (multiple installation records)"])
                         ])
-                    ])dnl
+                    ])
+                    package_with_version=${f##*/}
+                    AS_VAR_SET([SPKG_INSTALLED_VERSION], [${package_with_version#*-}])
                     AS_VAR_SET([is_installed], [yes])
+                    AS_CASE(["$SPKG_INSTALLED_VERSION"],
+                        [none], [AS_VAR_SET([spkg_installed_version_text], ["SPKG"])],
+                                [AS_VAR_SET([spkg_installed_version_text], ["SPKG version $SPKG_INSTALLED_VERSION"])])
                 ])
             done
             dnl Only check the first existing tree, so that we do not issue "multiple installation" warnings
             dnl when SAGE_LOCAL = SAGE_VENV
             break
         ])
     done
+    AS_VAR_IF(SPKG_INSTALLED_VERSION, [""], [dnl
+        AS_CASE(["$SPKG_VERSION"],
+                [none], [AS_VAR_SET([install_message],
+                                    ["SPKG will be installed"])],
+                        [AS_VAR_SET([install_message],
+                                    ["SPKG version $SPKG_VERSION will be installed"])])
+    ], [dnl
+        AS_IF([test "$SPKG_VERSION" = "$SPKG_INSTALLED_VERSION"],
+              [AS_VAR_SET([install_message],
+                          ["$spkg_installed_version_text is already installed"])],
+              [AS_VAR_SET([install_message],
+                          ["installed $spkg_installed_version_text will be replaced by version $SPKG_VERSION"])])
+    ])
     dnl
     dnl Determine whether package is enabled
     m4_pushdef([want_spkg], [SAGE_ENABLE_]SPKG_NAME)dnl
@@ -235,19 +260,19 @@ AC_DEFUN([SAGE_SPKG_FINALIZE], [dnl
       [standard], [dnl
         m4_pushdef([SAGE_NEED_SYSTEM_PACKAGES_VAR], [SAGE_NEED_SYSTEM_PACKAGES])dnl
         AS_VAR_IF([SAGE_ENABLE_]SPKG_NAME, [yes], [dnl
-            message="SPKG_TYPE, will be installed as an SPKG"
+            message="SPKG_TYPE, $install_message"
         ], [dnl
             message="SPKG_TYPE, but disabled using configure option"
         ])
       ], [dnl optional/experimental
         m4_pushdef([SAGE_NEED_SYSTEM_PACKAGES_VAR], [SAGE_NEED_SYSTEM_PACKAGES_OPTIONAL])dnl
         AS_VAR_IF([SAGE_ENABLE_]SPKG_NAME, [yes], [dnl
-            message="SPKG_TYPE, will be installed as an SPKG"
+            message="SPKG_TYPE, $install_message"
         ], [dnl
             message="SPKG_TYPE"
             m4_case(SPKG_SOURCE, [none], [], [dnl
                 dnl Non-dummy optional/experimental package, advertise how to install
-                message="$message, use \"$srcdir/configure --enable-SPKG_NAME\" to install"
+                message="$message, use \"$srcdir/configure --enable-SPKG_NAME\" to install SPKG version $SPKG_VERSION"
             ])
         ])
     ])
@@ -261,7 +286,8 @@ AC_DEFUN([SAGE_SPKG_FINALIZE], [dnl
     m4_case(SPKG_SOURCE,
       [pip], [dnl
         message="SPKG_TYPE pip package; use \"./sage -i SPKG_NAME\" to install"
-        uninstall_message="SPKG_TYPE pip package (installed)"
+        install_message="SPKG_TYPE pip package (installed)"
+        uninstall_message=
     ])dnl
     dnl
     SAGE_PACKAGE_VERSIONS="${SAGE_PACKAGE_VERSIONS}$(printf '\nvers_')SPKG_NAME = ${SPKG_VERSION}"
@@ -295,14 +321,15 @@ AC_DEFUN([SAGE_SPKG_FINALIZE], [dnl
                 [force],                     [ message="no suitable system package; this is an error"
                                                AS_VAR_APPEND([SAGE_NEED_SYSTEM_PACKAGES_VAR], [" SPKG_NAME"])
                                              ],
-                [installed],                 [ message="already installed as an SPKG$uninstall_message" ],
+                [installed],                 [ message="$install_message$uninstall_message"
+                                             ],
                                              [ message="$reason; $message" ])
             ])
         ])
 
     dnl Trac #29124: Do not talk about underscore club
     m4_bmatch(SPKG_NAME, [^_], [], [dnl
-        formatted_message=$(printf '%-45s%s' "SPKG_NAME-$SPKG_VERSION:" "$message")
+        formatted_message=$(printf '%-32s%s' "SPKG_NAME:" "$message")
         AC_MSG_RESULT([$formatted_message])
     ])
     dnl

pkgs/sage-conf/VERSION.txt

@@ -1 +1 @@
-9.7.beta7
+9.7.beta8

pkgs/sage-conf_pypi/VERSION.txt

@@ -1 +1 @@
-9.7.beta7
+9.7.beta8

pkgs/sage-docbuild/VERSION.txt

@@ -1 +1 @@
-9.7.beta7
+9.7.beta8

pkgs/sage-setup/VERSION.txt

@@ -1 +1 @@
-9.7.beta7
+9.7.beta8

pkgs/sage-sws2rst/VERSION.txt

@@ -1 +1 @@
-9.7.beta7
+9.7.beta8

pkgs/sagemath-categories/VERSION.txt

@@ -1 +1 @@
-9.7.beta7
+9.7.beta8

pkgs/sagemath-environment/VERSION.txt

@@ -1 +1 @@
-9.7.beta7
+9.7.beta8

pkgs/sagemath-objects/VERSION.txt

@@ -1 +1 @@
-9.7.beta7
+9.7.beta8