Merge branch 'develop' into t/31892/31892

.github/workflows/doc-build.yml

@@ -24,7 +24,6 @@ jobs:
           # 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

.homebrew-build-env

@@ -2,7 +2,7 @@
 # that activate keg-only homebrew package installations
 
 HOMEBREW=`brew --prefix` || return 1
-for l in gettext bzip2 texinfo polymake; do
+for l in bzip2 texinfo polymake; do
     if [ -d "$HOMEBREW/opt/$l/bin" ]; then
         PATH="$HOMEBREW/opt/$l/bin:$PATH"
     fi
@@ -39,7 +39,7 @@ for l in "gcc/lib/gcc/11 gcc/lib/gcc/10 gcc/lib/gcc/9"; do
 done
 export LIBRARY_PATH
 export CPATH
-for l in gettext; do
+for l in ; do
     if [ -d "$HOMEBREW/opt/$l/share/aclocal" ]; then
         ACLOCAL_PATH="$HOMEBREW/opt/$l/share/aclocal:$ACLOCAL_PATH"
     fi

.zenodo.json

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

VERSION.txt

@@ -1 +1 @@
-SageMath version 9.7.rc0, Release Date: 2022-08-30
+SageMath version 9.7.rc1, Release Date: 2022-09-07

build/bin/sage-spkg

@@ -451,20 +451,31 @@ echo "Setting up build directory for $PKG_NAME"
 cp -RLp "$PKG_SCRIPTS" "$PKG_NAME"
 cd "$PKG_NAME" || exit $?
 
-sage-uncompress-spkg -d src "$PKG_SRC"
-if [ $? -ne 0 ]; then
-    error_msg "Error: failed to extract $PKG_SRC"
-    exit 1
-fi
-
-echo "Finished extraction"
-
-cd src
-if ! sage-apply-patches; then
-    error_msg "Error applying patches"
-    exit 1
-fi
-cd ..
+case "$PKG_SRC" in
+    *.whl)
+        # (Platform-independent) wheel
+        # Do not extract, do not create a src directory,
+        # just copy to dist/ and create a simple install script.
+        mkdir -p dist
+        cp "$PKG_SRC" dist/
+        echo "sdh_store_and_pip_install_wheel ." > spkg-install.in
+        ;;
+    *)
+        # Source tarball
+        sage-uncompress-spkg -d src "$PKG_SRC"
+        if [ $? -ne 0 ]; then
+            error_msg "Error: failed to extract $PKG_SRC"
+            exit 1
+        fi
+        echo "Finished extraction"
+        cd src
+        if ! sage-apply-patches; then
+            error_msg "Error applying patches"
+            exit 1
+        fi
+        cd ..
+        ;;
+esac
 
 ##################################################################
 # The package has been extracted, prepare for installation

build/pkgs/_bootstrap/distros/arch.txt

@@ -1,4 +1,4 @@
 # Packages needed for ./bootstrap
-gettext autoconf automake libtool
+autoconf automake libtool
 # Otherwise: Error: could not locate the pkg-config autoconf macros. These are
 pkg-config

build/pkgs/_bootstrap/distros/conda.txt

@@ -1,2 +1,2 @@
 # Packages needed for ./bootstrap
-gettext autoconf automake libtool
+autoconf automake libtool

build/pkgs/_bootstrap/distros/cygwin.txt

@@ -1,2 +1,2 @@
 # Packages needed for ./bootstrap
-gettext-devel autoconf automake libtool
+autoconf automake libtool

build/pkgs/_bootstrap/distros/debian.txt

@@ -1,5 +1,4 @@
 # Packages needed for ./bootstrap
-gettext
 autoconf
 automake
 libtool

build/pkgs/_bootstrap/distros/fedora.txt

@@ -1,4 +1,4 @@
 # Packages needed for ./bootstrap
-gettext-devel autoconf automake libtool
+autoconf automake libtool
 # Fedora 26 needs:
 pkg-config

build/pkgs/_bootstrap/distros/freebsd.txt

@@ -1,2 +1,2 @@
 # Packages needed for ./bootstrap
-gettext autoconf automake libtool pkg-config
+autoconf automake libtool pkg-config

build/pkgs/_bootstrap/distros/homebrew.txt

@@ -1,2 +1,2 @@
 # Packages needed for ./bootstrap
-gettext autoconf automake libtool pkg-config
+autoconf automake libtool pkg-config

build/pkgs/_bootstrap/distros/nix.txt

@@ -1,2 +1,2 @@
 # Packages needed for ./bootstrap
-gettext autoconf automake libtool pkg-config
+autoconf automake libtool pkg-config

build/pkgs/_bootstrap/distros/opensuse.txt

@@ -1,5 +1,4 @@
 # Packages needed for ./bootstrap
-gettext-tools
 autoconf
 automake
 libtool

build/pkgs/_bootstrap/distros/void.txt

@@ -1,4 +1,3 @@
 # Packages needed for ./bootstrap
-gettext autoconf automake libtool
-gettext-devel
+autoconf automake libtool
 xtools mk-configure

build/pkgs/_prereq/distros/gentoo.txt

@@ -14,8 +14,6 @@ sys-devel/bc
 dev-lang/python
 sys-devel/flex
 app-misc/ca-certificates
-sys-devel/gettext
-dev-libs/libcroco
 dev-libs/libxml2
 sys-apps/findutils
 sys-apps/which

build/pkgs/_prereq/distros/slackware.txt

@@ -15,7 +15,5 @@ flex
 # for https upstream_url downloads
 ca-certificates
 pkg-config
-gettext-tools
-libcroco         # gettext dependency (msgfmt)
 libxml2
 cyrus-sasl

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=c44fe4052d0d6ba38b7e60b82fa757fe40290433
-md5=bd8ae7f5adee5ff7baea95f143c5f857
-cksum=371288794
+sha1=17621baa3704964f752a02c3a1533a8adb59cd3d
+md5=e1f4d86a1e996aeee5e5c072bf92f0a1
+cksum=3769097678

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-6da95c029d7e1c153af30f8f2f19396efcf7e199
+2e5af062ddd382d2d0eb8070dd0c6e872b77b6bd

build/pkgs/furo/checksums.ini

@@ -0,0 +1,5 @@
+tarball=furo-VERSION-py3-none-any.whl
+sha1=b9261dbe404cc13d399d50db0122fe48d7daeb23
+md5=fb331872d4d8a7d33f56aeb5df1f333f
+cksum=3430203884
+upstream_url=https://pypi.io/packages/py3/f/furo/furo-VERSION-py3-none-any.whl

build/pkgs/furo/dependencies

@@ -1,4 +1,4 @@
-$(PYTHON) beautifulsoup4 sphinx pygments | $(PYTHON_TOOLCHAIN)
+$(PYTHON) beautifulsoup4 sphinx pygments sphinx_basic_ng | $(PYTHON_TOOLCHAIN)
 
 ----------
 All lines of this file are ignored except the first.

build/pkgs/furo/package-version.txt

@@ -0,0 +1 @@
+2022.6.21

build/pkgs/furo/spkg-install.in

@@ -0,0 +1,2 @@
+cd src
+sdh_pip_install .

build/pkgs/furo/type

@@ -1 +1 @@
-optional
+standard

build/pkgs/gnulib/SPKG.rst

@@ -0,0 +1,9 @@
+gnulib: Modules imported from Gnulib
+====================================
+
+This script package represents the modules imported into the Sage source tree from Gnulib.
+
+Upstream Contact
+----------------
+
+https://www.gnu.org/software/gnulib/

build/pkgs/gnulib/package-version.txt

@@ -0,0 +1 @@
+f9b39c4e337f1dc0dd07c4f3985c476fb875d799

build/pkgs/gnulib/spkg-install

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

build/pkgs/gnulib/spkg-src

@@ -0,0 +1,40 @@
+#! /usr/bin/env bash
+
+# the commit hash below is the latest as of 2022-07-31
+# For updating gnulib, change this hash and run
+#
+# ./sage -sh -c 'build/pkgs/gnulib/spkg-src'
+#
+# Then commit the results.
+
+gnulibcommit="f9b39c4e337f1dc0dd07c4f3985c476fb875d799"
+
+gnulibtool="$SAGE_ROOT/upstream/gnulib/gnulib-tool"
+
+if [ -x "$gnulibtool" ]; then
+    cd upstream/gnulib
+    gnulibinstalled=`git rev-parse HEAD`
+    cd ../..
+    if [ ! x${gnulibcommit} = x${gnulibinstalled} ]; then
+        rm -rf upstream/gnulib
+    fi
+fi
+if [ ! -x "$gnulibtool" ]; then
+    echo >&2 "gnulib-tool needs to be installed and in your PATH. We install a copy in upstream/ "
+    mkdir -p upstream
+    cd upstream # use github mirror - faster, only needed stuff
+    mkdir -p gnulib
+    cd gnulib
+    eval git init ${quietquiet}
+    eval git remote add origin https://github.com/coreutils/gnulib.git ${quietquiet}
+    eval git fetch origin ${gnulibcommit} --depth 1 ${quietquiet}
+    eval git checkout FETCH_HEAD ${quietquiet}
+    cd ../..
+    if [ ! -x "$gnulibtool" ]; then
+        echo >&2 "Failure installing/updating gnulib in upstream/. "
+        exit 179
+    fi
+fi
+eval $gnulibtool --import iconv ${quietquiet}
+rm -rf lib/
+echo "${gnulibcommit}" > build/pkgs/gnulib/package-version.txt

build/pkgs/gnulib/type

@@ -0,0 +1 @@
+standard

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.7rc0
+sage-conf ~= 9.7rc1

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.7rc0
+sage-docbuild ~= 9.7rc1

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.7rc0
+sage-setup ~= 9.7rc1

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.7rc0
+sage-sws2rst ~= 9.7rc1

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.7rc0
+sagelib ~= 9.7rc1

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.7rc0
+sagemath-categories ~= 9.7rc1

build/pkgs/sagemath_doc_html/dependencies

@@ -1,4 +1,4 @@
-sagelib sphinx pplpy_doc | $(SAGERUNTIME) maxima networkx scipy sympy matplotlib pillow mathjax mpmath ipykernel jupyter_client conway_polynomials tachyon jmol ipywidgets jupyter_sphinx sage_docbuild elliptic_curves
+sagelib sphinx pplpy_doc | $(SAGERUNTIME) maxima networkx scipy sympy matplotlib pillow mathjax mpmath ipykernel jupyter_client conway_polynomials tachyon jmol ipywidgets jupyter_sphinx sage_docbuild elliptic_curves furo
 
 # Building the documentation has many dependencies, because all
 # documented modules are imported and because we use matplotlib to

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.7rc0
+sagemath-environment ~= 9.7rc1

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.7rc0
+sagemath-objects ~= 9.7rc1

build/pkgs/sphinx_basic_ng/SPKG.rst

@@ -0,0 +1,16 @@
+sphinx_basic_ng: A modern skeleton for Sphinx themes.
+=====================================================
+
+Description
+-----------
+
+A modern skeleton for Sphinx themes.
+
+License
+-------
+
+Upstream Contact
+----------------
+
+https://pypi.org/project/sphinx-basic-ng/
+

build/pkgs/sphinx_basic_ng/checksums.ini

@@ -0,0 +1,5 @@
+tarball=sphinx_basic_ng-VERSION.tar.gz
+sha1=03857ae3336e81db16599a68b826b6ed6053cd28
+md5=bdb1b36fd46f0b5b4f6c079e7350b860
+cksum=2230250036
+upstream_url=https://pypi.io/packages/source/s/sphinx_basic_ng/sphinx_basic_ng-VERSION.tar.gz

build/pkgs/sphinx_basic_ng/dependencies

@@ -0,0 +1,4 @@
+$(PYTHON) sphinx | $(PYTHON_TOOLCHAIN)
+
+----------
+All lines of this file are ignored except the first.

build/pkgs/sphinx_basic_ng/install-requires.txt

@@ -0,0 +1 @@
+sphinx-basic-ng

build/pkgs/sphinx_basic_ng/package-version.txt

@@ -0,0 +1 @@
+0.0.1a12

build/pkgs/sphinx_basic_ng/spkg-install.in

@@ -0,0 +1,2 @@
+cd src
+sdh_pip_install .

build/pkgs/sphinx_basic_ng/type

@@ -0,0 +1 @@
+standard

configure.ac

@@ -49,10 +49,10 @@ dnl Make sure the path to our own m4 macros is always properly set
 dnl and doesn't depend on how autoconf is called.
 AC_CONFIG_MACRO_DIR([m4])
 
-dnl The AC_LIB_RPATH macro comes from gettext, which is one of our bootstrap
-dnl packages. It defines, among other things, the $acl_shlibext variable that
+dnl The AC_LIB_RPATH macro comes from a Gnulib-provided file in m4/.
+dnl It defines, among other things, the $acl_shlibext variable that
 dnl contains the shared library extension for this system. We already use the
-dnl AM_ICONV macro from gettext (which ultimately calls AC_LIB_RPATH), and we
+dnl AM_ICONV macro from the same source (which ultimately calls AC_LIB_RPATH), and we
 dnl avoid involving libtool by using it to get the shared library extension.
 AC_LIB_RPATH
 AC_SUBST(SHLIBEXT, "${acl_shlibext}")
@@ -489,7 +489,7 @@ AC_ARG_ENABLE([doc],
   AS_HELP_STRING([--disable-doc],
                  [disable build of the Sage documentation and packages depending on it]), [
     dnl Disable packages needed for docbuilding
-    for pkg in sage_docbuild alabaster babel snowballstemmer imagesize sphinx sphinxcontrib_devhelp sphinxcontrib_jsmath sphinxcontrib_serializinghtml sphinxcontrib_applehelp sphinxcontrib_htmlhelp sphinxcontrib_qthelp sphinxcontrib_websupport jupyter_sphinx; do
+    for pkg in sage_docbuild alabaster babel snowballstemmer imagesize sphinx sphinxcontrib_devhelp sphinxcontrib_jsmath sphinxcontrib_serializinghtml sphinxcontrib_applehelp sphinxcontrib_htmlhelp sphinxcontrib_qthelp sphinxcontrib_websupport jupyter_sphinx furo; do
       AS_VAR_SET([SAGE_ENABLE_$pkg], [$enableval])
     done
     AS_VAR_IF([enableval], [no], [dnl Disable the docbuild by disabling the install tree for documentation