Merge tag '9.4.beta3' into #31873

SageMath version 9.4.beta3, Release Date: 2021-06-21

.github/workflows/lint.yml

@@ -30,7 +30,7 @@ jobs:
     - name: Install relint
       run: pip install tox relint
     - name: Lint using relint
-      run: tox -e relint src/
+      run: tox -e relint src/sage/
   lint-pyright:
     name: Static type check with pyright
     runs-on: ubuntu-latest

.zenodo.json

@@ -1,10 +1,10 @@
 {
     "description": "Mirror of the Sage https://sagemath.org/ source tree", 
     "license": "other-open", 
-    "title": "sagemath/sage: 9.4.beta1", 
-    "version": "9.4.beta1", 
+    "title": "sagemath/sage: 9.4.beta3", 
+    "version": "9.4.beta3", 
     "upload_type": "software", 
-    "publication_date": "2021-06-06", 
+    "publication_date": "2021-06-21", 
     "creators": [
         {
             "affiliation": "SageMath.org", 
@@ -15,7 +15,7 @@
     "related_identifiers": [
         {
             "scheme": "url", 
-            "identifier": "https://github.com/sagemath/sage/tree/9.4.beta1", 
+            "identifier": "https://github.com/sagemath/sage/tree/9.4.beta3", 
             "relation": "isSupplementTo"
         }, 
         {

VERSION.txt

@@ -1 +1 @@
-SageMath version 9.4.beta1, Release Date: 2021-06-06
+SageMath version 9.4.beta3, Release Date: 2021-06-21

build/bin/sage-dist-helpers

@@ -218,14 +218,6 @@ sdh_setup_bdist_wheel() {
 
 sdh_pip_install() {
     echo "Installing $PKG_NAME"
-    if [ -n "$SAGE_DESTDIR" ]; then
-        local sudo=""
-    else
-        local sudo="$SAGE_SUDO"
-    fi
-    $sudo sage-pip-uninstall "$@" || \
-        echo 2>&1 "Warning: Failure trying to uninstall a previous version of $PKG_NAME"
-
     mkdir -p dist
     rm -f dist/*.whl
     python3 -m pip wheel --wheel-dir=dist --no-binary :all: --verbose --no-deps --no-index --isolated --no-build-isolation "$@" || \

build/make/Makefile.in

@@ -338,23 +338,23 @@ DOC_DEPENDENCIES = sagelib sage_docbuild $(inst_sphinx) \
 doc: doc-html
 
 doc-html: $(DOC_DEPENDENCIES)
-	$(AM_V_at)cd ../.. && sage-logger -p './sage --docbuild --no-pdf-links all html $(SAGE_DOCBUILD_OPTS)' logs/dochtml.log
+	$(AM_V_at)cd "$(SAGE_SRC)/doc" && sage-logger -p "$(MAKE) doc-html" $(SAGE_ROOT)/logs/dochtml.log
 
 # 'doc-html-no-plot': build docs without building the graphics coming
 # from the '.. plot' directive, in case you want to save a few
 # megabytes of disk space. 'doc-clean' is a prerequisite because the
 # presence of graphics is cached in src/doc/output.
-doc-html-no-plot: doc-clean $(DOC_DEPENDENCIES)
-	$(AM_V_at)cd ../.. && sage-logger -p './sage --docbuild --no-pdf-links --no-plot all html $(SAGE_DOCBUILD_OPTS)' logs/dochtml.log
+doc-html-no-plot: doc-clean
+	$(AM_V_at)sage-logger -p "$(MAKE) SAGE_DOCBUILD_OPTS=\"$(SAGE_DOCBUILD_OPTS) --no-plot\" doc-html" $(SAGE_ROOT)/logs/dochtml.log
 
-doc-html-mathjax: $(DOC_DEPENDENCIES)
-	$(AM_V_at)cd ../.. && sage-logger -p './sage --docbuild --no-pdf-links all html -j $(SAGE_DOCBUILD_OPTS)' logs/dochtml.log
+doc-html-mathjax:
+	$(AM_V_at)sage-logger -p "$(MAKE) SAGE_DOCBUILD_OPTS=\"$(SAGE_DOCBUILD_OPTS) -j\" doc-html" $(SAGE_ROOT)/logs/dochtml.log
 
 # Keep target 'doc-html-jsmath' for backwards compatibility.
 doc-html-jsmath: doc-html-mathjax
 
 doc-pdf: $(DOC_DEPENDENCIES)
-	$(AM_V_at)cd ../.. && sage-logger -p './sage --docbuild all pdf $(SAGE_DOCBUILD_OPTS)' logs/docpdf.log
+	$(AM_V_at)cd "$(SAGE_SRC)/doc" && sage-logger -p "$(MAKE) doc-pdf" $(SAGE_ROOT)/logs/docpdf.log
 
 doc-clean: doc-src-clean doc-output-clean
 

build/pkgs/appdirs/SPKG.rst

@@ -0,0 +1,18 @@
+appdirs: A small Python module for determining appropriate platform-specific dirs, e.g. a "user data dir".
+==========================================================================================================
+
+Description
+-----------
+
+A small Python module for determining appropriate platform-specific dirs, e.g. a "user data dir".
+
+License
+-------
+
+MIT
+
+Upstream Contact
+----------------
+
+https://pypi.org/project/appdirs/
+

build/pkgs/appdirs/checksums.ini

@@ -0,0 +1,5 @@
+tarball=appdirs-VERSION.tar.gz
+sha1=1fa04e44b1084338cb7b21e9cf44fce5efb81840
+md5=d6bca12613174185dd9abc8a29f4f012
+cksum=1191718163
+upstream_url=https://pypi.io/packages/source/a/appdirs/appdirs-VERSION.tar.gz

build/pkgs/appdirs/dependencies

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

build/pkgs/appdirs/install-requires.txt

@@ -0,0 +1 @@
+appdirs

build/pkgs/appdirs/package-version.txt

@@ -0,0 +1 @@
+1.4.4

build/pkgs/appdirs/spkg-configure.m4

@@ -0,0 +1,7 @@
+SAGE_SPKG_CONFIGURE([appdirs], [
+    sage_spkg_install_appdirs=yes
+  ], [dnl REQUIRED-CHECK
+    AC_REQUIRE([SAGE_SPKG_CONFIGURE_VIRTUALENV])
+    dnl only needed as a dependency of virtualenv.
+    AS_VAR_SET([SPKG_REQUIRE], [$sage_spkg_install_virtualenv])
+  ])

build/pkgs/appdirs/spkg-install.in

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

build/pkgs/appdirs/type

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

build/pkgs/babel/checksums.ini

@@ -1,4 +1,5 @@
 tarball=Babel-VERSION.tar.gz
-sha1=6aed99e4fb8a2a75de7815599f610cdcbb81e3c2
-md5=c384ac03026e8fe6f9b90f55201f1bff
-cksum=3805303136
+sha1=1ce15f82eba5184cabe6ac1491cb58262e27adfd
+md5=7166099733d78aa857d74fa50d8ff58c
+cksum=1695340328
+upstream_url=https://pypi.io/packages/source/b/babel/Babel-VERSION.tar.gz

build/pkgs/babel/package-version.txt

@@ -1 +1 @@
-2.6.0
+2.9.1

build/pkgs/brial/spkg-configure.m4

@@ -1,6 +1,6 @@
 SAGE_SPKG_CONFIGURE([brial], [
   dnl Trac #31624: Avoid C++ ABI issues
-  SAGE_SPKG_DEPCHECK([gcc boost m4ri], [
+  SAGE_SPKG_DEPCHECK([gcc boost_cropped m4ri], [
     # If we're using the system m4ri and boost, ensure that we can
     # compile and run an executable linked against both libbrial and
     # libbrial_groebner (both are used by SageMath).

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=4b1b427c4e1cc5e3b7226a5c84d2312ada851086
-md5=ad2e1c54a9421a63d975f95dc771d11b
-cksum=3168609300
+sha1=ec569cd49d5143432ec4315b54e5771a69f5c6cf
+md5=1560d6f3eaf69380aa9e7110e9db9eb7
+cksum=707354543

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-7690208434ed1d4aab0ea40b760669494d502c42
+fcefe993200b34e7ca722800ace83e70d0159932

build/pkgs/distlib/SPKG.rst

@@ -0,0 +1,18 @@
+distlib: Distribution utilities
+===============================
+
+Description
+-----------
+
+Distribution utilities
+
+License
+-------
+
+Python license
+
+Upstream Contact
+----------------
+
+https://pypi.org/project/distlib/
+

build/pkgs/distlib/checksums.ini

@@ -0,0 +1,5 @@
+tarball=distlib-VERSION.zip
+sha1=1c575431e31c32d25596c360e81bba7fe4638669
+md5=4baf787d8aceb260d6f77cb31bf27cf6
+cksum=2902365751
+upstream_url=https://pypi.io/packages/source/d/distlib/distlib-VERSION.zip

build/pkgs/distlib/dependencies

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

build/pkgs/distlib/install-requires.txt

@@ -0,0 +1 @@
+distlib

build/pkgs/distlib/package-version.txt

@@ -0,0 +1 @@
+0.3.1

build/pkgs/distlib/spkg-configure.m4

@@ -0,0 +1,7 @@
+SAGE_SPKG_CONFIGURE([distlib], [
+    AC_REQUIRE([SAGE_SPKG_CONFIGURE_VIRTUALENV])
+    sage_spkg_install_distlib=yes
+  ], [dnl REQUIRED-CHECK
+    dnl only needed as a dependency of virtualenv.
+    AS_VAR_SET([SPKG_REQUIRE], [$sage_spkg_install_virtualenv])
+  ])

build/pkgs/distlib/spkg-install.in

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

build/pkgs/distlib/type

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

build/pkgs/ecl/distros/alpine.txt

@@ -0,0 +1 @@
+ecl-dev

build/pkgs/ecl/distros/arch.txt

@@ -0,0 +1 @@
+ecl

build/pkgs/ecl/distros/fedora.txt

@@ -0,0 +1 @@
+ecl

build/pkgs/ecl/distros/gentoo.txt

@@ -0,0 +1 @@
+dev-lisp/ecls

build/pkgs/ecl/spkg-configure.m4

@@ -0,0 +1,44 @@
+SAGE_SPKG_CONFIGURE([ecl], [
+
+  # Default to installing the SPKG
+  sage_spkg_install_ecl=yes
+
+  SAGE_SPKG_DEPCHECK([gc gmp mpir], [
+    AC_PATH_PROG([ECL_CONFIG], [ecl-config])
+    AS_IF([test x$ECL_CONFIG != x], [
+      # "CPPFLAGS" is not a typo, the --cflags output from
+      # ecl-config typically contains -D and -I flags.
+      saved_CPPFLAGS="${CPPFLAGS}"
+      CPPFLAGS="${CPPFLAGS} $($ECL_CONFIG --cflags)"
+
+      AC_LANG_PUSH([C])
+      AC_RUN_IFELSE([AC_LANG_PROGRAM([[
+        #include <ecl/config.h>
+      ]],[[
+        if (ECL_VERSION_NUMBER < 210201) { return 1; }
+      ]])],
+      [
+        sage_spkg_install_ecl=no
+      ],
+      [
+        CPPFLAGS="${saved_CPPFLAGS}"
+        AC_MSG_NOTICE([ecl found but too old])
+      ])
+      AC_LANG_POP([C])
+    ])
+  ])
+],[],[],[
+  # post-check
+  if test x$sage_spkg_install_ecl = xyes; then
+    AC_SUBST(SAGE_ECL_CONFIG, ['${prefix}'/bin/ecl-config])
+  else
+    AC_SUBST(SAGE_ECL_CONFIG, [$ECL_CONFIG])
+  fi
+
+  # Maxima cannot yet be provided by the system, so we always use
+  # the SAGE_LOCAL path for now.
+  AC_SUBST(SAGE_MAXIMA_FAS, ['${prefix}'/lib/ecl/maxima.fas])
+
+  # Likewise for the optional Kenzo SPKG
+  AC_SUBST(SAGE_KENZO_FAS, ['${prefix}'/lib/ecl/kenzo.fas])
+])

build/pkgs/filelock/SPKG.rst

@@ -0,0 +1,18 @@
+filelock: A platform independent file lock
+==========================================
+
+Description
+-----------
+
+A platform independent file lock.
+
+License
+-------
+
+Public Domain <http://unlicense.org>
+
+Upstream Contact
+----------------
+
+https://pypi.org/project/filelock/
+

build/pkgs/filelock/checksums.ini

@@ -0,0 +1,5 @@
+tarball=filelock-VERSION.tar.gz
+sha1=ca03bf213ee1d7a9b6353cebc265072aae40fdcb
+md5=c1fe6d9a7433a7ca6ce4f36e273317d1
+cksum=2927344437
+upstream_url=https://pypi.io/packages/source/f/filelock/filelock-VERSION.tar.gz

build/pkgs/filelock/dependencies

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

build/pkgs/filelock/install-requires.txt

@@ -0,0 +1 @@
+filelock

build/pkgs/filelock/package-version.txt

@@ -0,0 +1 @@
+3.0.12

build/pkgs/filelock/spkg-configure.m4

@@ -0,0 +1,9 @@
+SAGE_SPKG_CONFIGURE([filelock], [
+    sage_spkg_install_filelock=yes
+  ], [dnl REQUIRED-CHECK
+    AC_REQUIRE([SAGE_SPKG_CONFIGURE_VIRTUALENV])
+    AC_REQUIRE([SAGE_SPKG_CONFIGURE_TOX])
+    dnl only needed as a dependency of tox and virtualenv.
+    AS_IF([test $sage_spkg_install_virtualenv = no -a $sage_spkg_install_tox = no],
+          AS_VAR_SET([SPKG_REQUIRE], [no]))
+  ])

build/pkgs/filelock/spkg-install.in

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

build/pkgs/filelock/type

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

build/pkgs/fplll/checksums.ini

@@ -1,5 +1,5 @@
 tarball=fplll-VERSION.tar.gz
-sha1=a62fc9aa2a4736e9680a336b092f432c31ddac43
-md5=db2f0f46d4de3e8ab8ed73a79d19ffc3
-cksum=1237963825
+sha1=fe1b225f2bff07b7b832ae8b20ffc85acfd231cd
+md5=44db0a42c33e5aa60264b32ab0063351
+cksum=3420408626
 upstream_url=https://github.com/fplll/fplll/releases/download/VERSION/fplll-VERSION.tar.gz

build/pkgs/fplll/package-version.txt

@@ -1 +1 @@
-5.4.0
+5.4.1

build/pkgs/fplll/spkg-configure.m4

@@ -8,7 +8,7 @@ SAGE_SPKG_CONFIGURE([fplll], [
     dnl Trac #31025: FPLLL/FPyLLL make no guarantee regarding compatibility
     dnl other than "whatever versions were released at the same time should work together"
     PKG_CHECK_MODULES([FPLLL],
-                      [fplll = 5.4.0],
+                      [fplll >= 5.4.0 fplll <= 5.4.1],
                       [sage_spkg_install_fplll=no],
                       [sage_spkg_install_fplll=yes])
   ])