Merge tag '9.5.beta9' into t/31306/replace_use_of_sage_extcode_by_imp…

…ortlib_resources SageMath version 9.5.beta9, Release Date: 2021-12-23
sagemath · Dec 23, 2021 · 9873958 · 9873958
2 parents 09787af + c5af195
commit 9873958
Show file tree

Hide file tree

Showing 347 changed files with 8,215 additions and 6,251 deletions.
diff --git a/.github/workflows/tox-experimental.yml b/.github/workflows/tox-experimental.yml
@@ -41,7 +41,7 @@ jobs:
         # This list is different from the one in tox.yml:
         # Trac #31526 switches gcc 4.x-based distributions to using the gcc_spkg configuration factor
         # Trac #32281 removes gcc 4.x-based distributions whose binutils are unusable
-        tox_system_factor: [ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, debian-jessie-gcc_spkg, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, centos-7-gcc_spkg, centos-8, gentoo-python3.9, gentoo-python3.10, archlinux-latest, opensuse-15, opensuse-15.3, opensuse-tumbleweed, slackware-14.2, conda-forge, ubuntu-bionic-i386, manylinux-2_24-i686, debian-buster-i386, centos-7-i386-gcc_spkg]
+        tox_system_factor: [ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, ubuntu-impish, ubunty-jammy, debian-stretch, debian-buster, debian-bullseye, debian-bookworm, debian-sid, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, linuxmint-20.2. linuxmint-20.3, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, fedora-35, fedora-36,  centos-7-gcc_spkg, centos-8, gentoo-python3.9, gentoo-python3.10, archlinux-latest, opensuse-15, opensuse-15.3, opensuse-tumbleweed, slackware-14.2, conda-forge, ubuntu-bionic-i386, manylinux-2_24-i686, debian-buster-i386, centos-7-i386-gcc_spkg]
         tox_packages_factor: [maximal]
         targets_pattern: [0-g, h-o, p, q-z]
     env:

diff --git a/.github/workflows/tox-gcc_spkg.yml b/.github/workflows/tox-gcc_spkg.yml
diff --git a/.github/workflows/tox-optional.yml b/.github/workflows/tox-optional.yml
@@ -41,7 +41,7 @@ jobs:
         # This list is different from the one in tox.yml:
         # Trac #31526 switches gcc 4.x-based distributions to using the gcc_spkg configuration factor
         # Trac #32281 removes gcc 4.x-based distributions whose binutils are unusable
-        tox_system_factor: [ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, debian-jessie-gcc_spkg, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, centos-7-gcc_spkg, centos-8, gentoo-python3.9, gentoo-python3.10, archlinux-latest, opensuse-15, opensuse-15.3, opensuse-tumbleweed, slackware-14.2, conda-forge, ubuntu-bionic-i386, manylinux-2_24-i686, debian-buster-i386, centos-7-i386-gcc_spkg]
+        tox_system_factor: [ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, ubuntu-impish, ubunty-jammy, debian-stretch, debian-buster, debian-bullseye, debian-bookworm, debian-sid, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, linuxmint-20.2. linuxmint-20.3, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, fedora-35, fedora-36,  centos-7-gcc_spkg, centos-8, gentoo-python3.9, gentoo-python3.10, archlinux-latest, opensuse-15, opensuse-15.3, opensuse-tumbleweed, slackware-14.2, conda-forge, ubuntu-bionic-i386, manylinux-2_24-i686, debian-buster-i386, centos-7-i386-gcc_spkg]
         tox_packages_factor: [maximal]
         targets_pattern: [0-g, h-o, p, q-z]
     env:

diff --git a/.github/workflows/tox.yml b/.github/workflows/tox.yml
@@ -38,7 +38,7 @@ jobs:
       fail-fast: false
       max-parallel: 20
       matrix:
-        tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, ubuntu-impish, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, linuxmint-20.2, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, fedora-35, centos-7, centos-8, gentoo-python3.9, gentoo-python3.10, archlinux-latest, opensuse-15, opensuse-15.3, opensuse-tumbleweed, slackware-14.2, conda-forge, ubuntu-bionic-i386, manylinux-2_24-i686, debian-buster-i386, centos-7-i386]
+        tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-groovy, ubuntu-hirsute, ubuntu-impish, ubunty-jammy,  debian-stretch, debian-buster, debian-bullseye, debian-bookworm, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, linuxmint-20.1, linuxmint-20.2, linuxmint-20.3, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, fedora-35, fedora-36, centos-7, centos-8, gentoo-python3.9, gentoo-python3.10, archlinux-latest, opensuse-15, opensuse-15.3, opensuse-tumbleweed, slackware-14.2, conda-forge, ubuntu-bionic-i386, manylinux-2_24-i686, debian-buster-i386, centos-7-i386]
         tox_packages_factor: [minimal, standard]
     env:
       TOX_ENV: docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}

diff --git a/.zenodo.json b/.zenodo.json
@@ -1,10 +1,10 @@
 {
     "description": "Mirror of the Sage https://sagemath.org/ source tree", 
     "license": "other-open", 
-    "title": "sagemath/sage: 9.5.beta8", 
-    "version": "9.5.beta8", 
+    "title": "sagemath/sage: 9.5.beta9", 
+    "version": "9.5.beta9", 
     "upload_type": "software", 
-    "publication_date": "2021-12-12", 
+    "publication_date": "2021-12-23", 
     "creators": [
         {
             "affiliation": "SageMath.org", 
@@ -15,7 +15,7 @@
     "related_identifiers": [
         {
             "scheme": "url", 
-            "identifier": "https://github.com/sagemath/sage/tree/9.5.beta8", 
+            "identifier": "https://github.com/sagemath/sage/tree/9.5.beta9", 
             "relation": "isSupplementTo"
         }, 
         {

diff --git a/README.md b/README.md
@@ -5,7 +5,7 @@
 >   "Creating a Viable Open Source Alternative to
 >    Magma, Maple, Mathematica, and MATLAB"
 
->   Copyright (C) 2005-2020 The Sage Development Team
+>   Copyright (C) 2005-2021 The Sage Development Team
 
    https://www.sagemath.org
 
@@ -37,10 +37,14 @@ or ask on [ask.sagemath.org](https://ask.sagemath.org).
 Supported Platforms
 -------------------
 
-Sage fully supports all major Linux distributions, recent versions of
+Sage attempts to support all major Linux distributions, recent versions of
 macOS, and Windows (using Cygwin, Windows Subsystem for Linux, or
 using virtualization).
 
+Detailed information on supported platforms for a specific version of Sage
+can be found in the section "Availability and installation help" of the
+[release tour](https://wiki.sagemath.org/ReleaseTours) for this version.
+
 We highly appreciate contributions to Sage that fix portability bugs
 and help port Sage to new platforms; let us know at the [sage-devel
 mailing list](https://groups.google.com/group/sage-devel).
@@ -234,8 +238,10 @@ Guide](https://doc.sagemath.org/html/en/installation).
    [debian.txt](build/pkgs/_prereq/distros/debian.txt)
    (also for Ubuntu, Linux Mint, etc.),
    [fedora.txt](build/pkgs/_prereq/distros/fedora.txt)
-   (also for Red Hat, CentOS), and
-   [slackware.txt](build/pkgs/_prereq/distros/slackware.txt).
+   (also for Red Hat, CentOS),
+   [opensuse.txt](build/pkgs/_prereq/distros/opensuse.txt)
+   [slackware.txt](build/pkgs/_prereq/distros/slackware.txt), and
+   [void.txt](build/pkgs/_prereq/distros/void.txt).
 
 7. Optional: It is recommended that you have both LaTeX and the
    ImageMagick tools (e.g. the "convert" command) installed since some
@@ -500,9 +506,9 @@ do.
 1. To make a binary distribution with your currently installed packages,
    visit [sagemath/binary-pkg](https://github.com/sagemath/binary-pkg).
 
-2. (**Obsolete, probably broken**) To make your own source tarball of Sage, type:
+2. To make your own source tarball of Sage, type:
 
-        $ sage --sdist
+        $ make dist
 
    The result is placed in the directory `dist/`.
 

diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-SageMath version 9.5.beta8, Release Date: 2021-12-12
+SageMath version 9.5.beta9, Release Date: 2021-12-23
diff --git a/build/make/Makefile.in b/build/make/Makefile.in
@@ -672,7 +672,16 @@ $(1)-uninstall: $(1)-$(4)-uninstall
 
 $(1)-clean: $(1)-uninstall
 
+# Recursive tox invocation (note - we do not set the environment here).
+# Setting SAGE_SPKG_WHEELS is for the benefit of sagelib's tox.ini
+$(1)-tox-%: FORCE
+	$(AM_V_at)cd '$$(SAGE_ROOT)/build/pkgs/$(1)/src' && \
+		export PATH="$$(SAGE_ORIG_PATH)" && \
+		SAGE_SPKG_WHEELS=$$(SAGE_LOCAL)/var/lib/sage/wheels \
+		tox -v -v -v -e $$*
+
 .PHONY: $(1) $(1)-uninstall $(1)-build-deps $(1)-no-deps $(1)-clean
+
 endef
 
 $(foreach pkgname,$(SCRIPT_PACKAGES),\

diff --git a/build/pkgs/4ti2/distros/cygwin.txt b/build/pkgs/4ti2/distros/cygwin.txt
@@ -1 +1,2 @@
+lib4ti2_0
 lib4ti2-devel
diff --git a/build/pkgs/_recommended/distros/debian.txt b/build/pkgs/_recommended/distros/debian.txt
@@ -13,5 +13,5 @@ dvipng
 # to run the Jmol 3D viewer from the console and generate images for 3D plots in the documentation
 default-jdk
 # to produce animations
-ffmpeg
+# ffmpeg -- this is a separate script package
 libavdevice-dev
diff --git a/build/pkgs/_recommended/distros/homebrew.txt b/build/pkgs/_recommended/distros/homebrew.txt
@@ -1,8 +1,8 @@
 # To convert Jupyter notebooks to pdf:
 # pandoc -- this is a separate script package
 # To produce animations:
-ffmpeg
-imagemagick
+# ffmpeg -- this is a separate script package
+# imagemagick -- this is a separate script package
 # Homebrew's texinfo can be used to build the info files for ecl and
 # maxima but the OS X default version of texinfo cannot.
 texinfo
diff --git a/build/pkgs/_recommended/distros/macports.txt b/build/pkgs/_recommended/distros/macports.txt
@@ -1,8 +1,8 @@
 # To convert Jupyter notebooks to pdf:
 # pandoc -- this is a separate script package
 # To produce animations:
-ffmpeg
-imagemagick
+# ffmpeg -- this is a separate script package
+# imagemagick -- this is a separate script package
 # MacPorts's texinfo can be used to build the info files for ecl and
 # maxima but the OS X default version of texinfo cannot.
 texinfo
diff --git a/build/pkgs/configure/checksums.ini b/build/pkgs/configure/checksums.ini
@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=07d98dfc41a546e8fbcedc500e0c29927061d2b2
-md5=ccdc4b7a6c1ec9de8a198a5b69bf7cba
-cksum=2208364100
+sha1=40df2ac9634227a77a83b6524ba9696b961c3fb6
+md5=696e5df05ca484f2de649d104e6a5149
+cksum=589835683
diff --git a/build/pkgs/configure/package-version.txt b/build/pkgs/configure/package-version.txt
@@ -1 +1 @@
-36135459d57177c9480eda0f779c0fb8650727be
+b879fe3b0554c844c224d7b139f698caef4c3905
diff --git a/build/pkgs/cysignals/checksums.ini b/build/pkgs/cysignals/checksums.ini
@@ -1,5 +1,5 @@
 tarball=cysignals-VERSION.tar.gz
-sha1=81952b37562c0bbdbe3b458c96ef64f47c92ab45
-md5=667f1ab086e1f5f79ee6ad4826e357b1
-cksum=2113264608
+sha1=7d42fa85f48123a988f43e437b01d13e42aba919
+md5=424a762509abdd80a7b55d302b83aa6e
+cksum=1506931565
 upstream_url=https://pypi.io/packages/source/c/cysignals/cysignals-VERSION.tar.gz
diff --git a/build/pkgs/cysignals/package-version.txt b/build/pkgs/cysignals/package-version.txt
@@ -1 +1 @@
-1.10.3
+1.11.2
diff --git a/build/pkgs/debugpy/type b/build/pkgs/debugpy/type
@@ -1 +1 @@
-standard
+optional
diff --git a/build/pkgs/ffmpeg/SPKG.rst b/build/pkgs/ffmpeg/SPKG.rst
@@ -0,0 +1,25 @@
+ffmpeg: ffmpeg video converter
+==============================
+
+Description
+-----------
+
+ffmpeg is a very fast video and audio converter that can also grab from a live
+audio/video source. It can also convert between arbitrary sample rates and
+resize video on the fly with a high quality polyphase filter.
+
+License
+-------
+
+"FFmpeg is licensed under the GNU Lesser General Public License (LGPL) version
+2.1 or later. However, FFmpeg incorporates several optional parts and
+optimizations that are covered by the GNU General Public License (GPL) version
+2 or later. If those parts get used the GPL applies to all of FFmpeg."
+
+http://ffmpeg.org/legal.html
+
+Upstream Contact
+----------------
+
+http://ffmpeg.org/
+
diff --git a/build/pkgs/ffmpeg/distros/alpine.txt b/build/pkgs/ffmpeg/distros/alpine.txt
@@ -0,0 +1 @@
+ffmpeg
diff --git a/build/pkgs/ffmpeg/distros/arch.txt b/build/pkgs/ffmpeg/distros/arch.txt
@@ -0,0 +1 @@
+ffmpeg
diff --git a/build/pkgs/ffmpeg/distros/conda.txt b/build/pkgs/ffmpeg/distros/conda.txt
@@ -0,0 +1 @@
+imageio-ffmpeg
diff --git a/build/pkgs/ffmpeg/distros/debian.txt b/build/pkgs/ffmpeg/distros/debian.txt
@@ -0,0 +1 @@
+ffmpeg
diff --git a/build/pkgs/ffmpeg/distros/fedora.txt b/build/pkgs/ffmpeg/distros/fedora.txt
@@ -0,0 +1 @@
+ffmpeg
diff --git a/build/pkgs/ffmpeg/distros/freebsd.txt b/build/pkgs/ffmpeg/distros/freebsd.txt
@@ -0,0 +1 @@
+multimedia/ffmpeg
diff --git a/build/pkgs/ffmpeg/distros/homebrew.txt b/build/pkgs/ffmpeg/distros/homebrew.txt
@@ -0,0 +1 @@
+ffmpeg
diff --git a/build/pkgs/ffmpeg/distros/macports.txt b/build/pkgs/ffmpeg/distros/macports.txt
@@ -0,0 +1 @@
+ffmpeg
diff --git a/build/pkgs/ffmpeg/distros/nix.txt b/build/pkgs/ffmpeg/distros/nix.txt
@@ -0,0 +1 @@
+ffmpeg
diff --git a/build/pkgs/ffmpeg/distros/opensuse.txt b/build/pkgs/ffmpeg/distros/opensuse.txt
@@ -0,0 +1 @@
+ffmpeg
diff --git a/build/pkgs/ffmpeg/distros/repology.txt b/build/pkgs/ffmpeg/distros/repology.txt
@@ -0,0 +1 @@
+ffmpeg
diff --git a/build/pkgs/ffmpeg/distros/void.txt b/build/pkgs/ffmpeg/distros/void.txt
@@ -0,0 +1 @@
+ffmpeg
diff --git a/build/pkgs/ffmpeg/spkg-configure.m4 b/build/pkgs/ffmpeg/spkg-configure.m4
@@ -0,0 +1,5 @@
+SAGE_SPKG_CONFIGURE([ffmpeg], [
+   AC_PATH_PROG([FFMPEG], [ffmpeg])
+   AS_IF([test -z "$ac_cv_path_FFMPEG"], [sage_spkg_install_ffmpeg=yes])
+])
+
diff --git a/build/pkgs/ffmpeg/type b/build/pkgs/ffmpeg/type
@@ -0,0 +1 @@
+optional