Merge #32937

sagemath · May 12, 2022 · 7619755 · 7619755
2 parents e68a28f + 65cfa33
commit 7619755
Show file tree

Hide file tree

Showing 74 changed files with 521 additions and 320 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -31,10 +31,9 @@ jobs:
         run: |
           # Reuse built SAGE_LOCAL contained in the Docker image 
           ./bootstrap
-          ./configure --enable-build-as-root --prefix=/sage/local --with-sage-venv --enable-editable
+          ./configure --enable-build-as-root --prefix=/sage/local --with-sage-venv --enable-editable --enable-download-from-upstream-url
           # Install test tools
           apt-get install -y git
-          ./sage -python -m pip install coverage
       
       - name: Static code check with pyright
         run: pyright    
@@ -46,7 +45,9 @@ jobs:
           SAGE_NUM_THREADS: 2
 
       - name: Test
-        run: ../sage -python -m coverage run ./bin/sage-runtests --all -p2
+        run: |
+          ../sage -python -m pip install coverage
+          ../sage -python -m coverage run ./bin/sage-runtests --all -p2
         working-directory: ./src
 
       - name: Prepare coverage results

diff --git a/.github/workflows/ci-cygwin-minimal.yml b/.github/workflows/ci-cygwin-minimal.yml
@@ -43,7 +43,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - name: tox
       run: |
@@ -103,7 +103,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - name: tox
       run: |
@@ -168,7 +168,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -238,7 +238,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -306,7 +306,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -374,7 +374,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -442,7 +442,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -514,7 +514,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -586,7 +586,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -658,7 +658,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -728,7 +728,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -796,7 +796,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -864,7 +864,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -932,7 +932,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -1000,7 +1000,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:

diff --git a/.github/workflows/ci-cygwin-standard.yml b/.github/workflows/ci-cygwin-standard.yml
@@ -43,7 +43,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - name: tox
       run: |
@@ -103,7 +103,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - name: tox
       run: |
@@ -168,7 +168,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -238,7 +238,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -306,7 +306,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -374,7 +374,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -442,7 +442,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -514,7 +514,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -586,7 +586,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -658,7 +658,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -728,7 +728,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -796,7 +796,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -864,7 +864,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -932,7 +932,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:
@@ -1000,7 +1000,7 @@ jobs:
       shell: bash {0}
       run: |
         choco --version
-        PACKAGES="python38 python38-pip"
+        PACKAGES="python39 python39-pip"
         choco install $PACKAGES --source cygwin
     - uses: actions/download-artifact@v2
       with:

diff --git a/.github/workflows/doc-build.yml b/.github/workflows/doc-build.yml
@@ -23,7 +23,7 @@ jobs:
         run: |
           # Reuse built SAGE_LOCAL contained in the Docker image 
           ./bootstrap
-          ./configure --enable-build-as-root --prefix=/sage/local --with-sage-venv
+          ./configure --enable-build-as-root --prefix=/sage/local --with-sage-venv --enable-download-from-upstream-url
 
       - name: Build
         run: make doc-html

diff --git a/.github/workflows/tox-experimental.yml b/.github/workflows/tox-experimental.yml
@@ -38,7 +38,7 @@ jobs:
       fail-fast: false
       max-parallel: 6
       matrix:
-        tox_system_factor: [gitpod, ubuntu-trusty-toolchain-gcc_9, ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-hirsute, ubuntu-impish, ubuntu-jammy,  debian-stretch, debian-buster, debian-bullseye, debian-bookworm, debian-sid, 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-devtoolset-gcc_11, centos-stream-8, gentoo-python3.9, gentoo-python3.10, archlinux-latest, opensuse-15.3, opensuse-tumbleweed, conda-forge, ubuntu-bionic-i386, manylinux-2_24-i686, debian-buster-i386, centos-7-i386-devtoolset-gcc_11]
+        tox_system_factor: [gitpod, ubuntu-trusty-toolchain-gcc_9, ubuntu-xenial-toolchain-gcc_9, ubuntu-bionic, ubuntu-focal, ubuntu-hirsute, ubuntu-impish, ubuntu-jammy, ubuntu-kinetic, debian-stretch, debian-buster, debian-bullseye, debian-bookworm, debian-sid, linuxmint-19, linuxmint-19.3, linuxmint-20.1, linuxmint-20.2, linuxmint-20.3, linuxmint-21, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, fedora-35, fedora-36, fedora-37, centos-7-devtoolset-gcc_11, centos-stream-8, gentoo-python3.9, gentoo-python3.10, archlinux-latest, opensuse-15.3, opensuse-tumbleweed, conda-forge, ubuntu-bionic-i386, manylinux-2_24-i686, debian-buster-i386, centos-7-i386-devtoolset-gcc_11]
         tox_packages_factor: [maximal]
         targets_pattern: [0-g, h-o, p, q-z]
     env:

diff --git a/.github/workflows/tox-optional.yml b/.github/workflows/tox-optional.yml
@@ -38,7 +38,7 @@ jobs:
       fail-fast: false
       max-parallel: 6
       matrix:
-        tox_system_factor: [ubuntu-trusty-toolchain-gcc_9, ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-hirsute, ubuntu-impish, ubuntu-jammy, debian-stretch, debian-buster, debian-bullseye, debian-bookworm, debian-sid, 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-devtoolset-gcc_11, centos-stream-8, gentoo-python3.9, gentoo-python3.10, archlinux-latest, opensuse-15.3, opensuse-tumbleweed, slackware-14.2, conda-forge, ubuntu-bionic-i386, manylinux-2_24-i686, debian-buster-i386, centos-7-i386-devtoolset-gcc_11]
+        tox_system_factor: [gitpod, ubuntu-trusty-toolchain-gcc_9, ubuntu-xenial-toolchain-gcc_9, ubuntu-bionic, ubuntu-focal, ubuntu-hirsute, ubuntu-impish, ubuntu-jammy, ubuntu-kinetic, debian-stretch, debian-buster, debian-bullseye, debian-bookworm, debian-sid, linuxmint-19, linuxmint-19.3, linuxmint-20.1, linuxmint-20.2, linuxmint-20.3, linuxmint-21, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, fedora-35, fedora-36, fedora-37, centos-7-devtoolset-gcc_11, centos-stream-8, gentoo-python3.9, gentoo-python3.10, archlinux-latest, opensuse-15.3, opensuse-tumbleweed, conda-forge, ubuntu-bionic-i386, manylinux-2_24-i686, debian-buster-i386, centos-7-i386-devtoolset-gcc_11]
         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: [gitpod, ubuntu-trusty-toolchain-gcc_9, ubuntu-xenial, ubuntu-bionic, ubuntu-focal, ubuntu-hirsute, ubuntu-impish, ubuntu-jammy,  debian-stretch, debian-buster, debian-bullseye, debian-bookworm, debian-sid, 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-devtoolset-gcc_11, centos-stream-8, gentoo-python3.9, gentoo-python3.10, archlinux-latest, opensuse-15.3, opensuse-tumbleweed, conda-forge, ubuntu-bionic-i386, manylinux-2_24-i686, debian-buster-i386, centos-7-i386-devtoolset-gcc_11]
+        tox_system_factor: [gitpod, ubuntu-trusty-toolchain-gcc_9, ubuntu-xenial-toolchain-gcc_9, ubuntu-bionic, ubuntu-focal, ubuntu-hirsute, ubuntu-impish, ubuntu-jammy, ubuntu-kinetic, debian-stretch, debian-buster, debian-bullseye, debian-bookworm, debian-sid, linuxmint-19, linuxmint-19.3, linuxmint-20.1, linuxmint-20.2, linuxmint-20.3, linuxmint-21, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, fedora-33, fedora-34, fedora-35, fedora-36, fedora-37, centos-7-devtoolset-gcc_11, centos-stream-8, gentoo-python3.9, gentoo-python3.10, archlinux-latest, opensuse-15.3, opensuse-tumbleweed, conda-forge, ubuntu-bionic-i386, manylinux-2_24-i686, debian-buster-i386, centos-7-i386-devtoolset-gcc_11]
         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.6.rc1", 
-    "version": "9.6.rc1", 
+    "title": "sagemath/sage: 9.6.rc3", 
+    "version": "9.6.rc3", 
     "upload_type": "software", 
-    "publication_date": "2022-04-19", 
+    "publication_date": "2022-04-29", 
     "creators": [
         {
             "affiliation": "SageMath.org", 
@@ -15,7 +15,7 @@
     "related_identifiers": [
         {
             "scheme": "url", 
-            "identifier": "https://github.com/sagemath/sage/tree/9.6.rc1", 
+            "identifier": "https://github.com/sagemath/sage/tree/9.6.rc3", 
             "relation": "isSupplementTo"
         }, 
         {

diff --git a/README.md b/README.md
@@ -251,7 +251,7 @@ in the Installation Guide.
       ``ExtUtils::MakeMaker``), `ranlib`, `git`, `tar`, `bc`.
 
     - Python 3.4 or later, or Python 2.7, a full installation including
-      `urllib`; but ideally version 3.7.x, 3.8.x, 3.9.x, or 3.10.x, which
+      `urllib`; but ideally version 3.8.x, 3.9.x, or 3.10.x, which
       will avoid having to build Sage's own copy of Python 3.
 
     We have collected lists of system packages that provide these build

diff --git a/VERSION.txt b/VERSION.txt
@@ -1 +1 @@
-SageMath version 9.6.rc1, Release Date: 2022-04-19
+SageMath version 9.6.rc3, Release Date: 2022-04-29
diff --git a/build/bin/write-dockerfile.sh b/build/bin/write-dockerfile.sh
@@ -13,7 +13,7 @@ EXTRA_SAGE_PACKAGES="${5:-_bootstrap}"
 STRIP_COMMENTS="sed s/#.*//;"
 SAGE_ROOT=.
 export PATH="$SAGE_ROOT"/build/bin:$PATH
-SYSTEM_PACKAGES=
+SYSTEM_PACKAGES=$EXTRA_SYSTEM_PACKAGES
 CONFIGURE_ARGS="--enable-option-checking "
 for PKG_BASE in $($SAGE_ROOT/sage -package list --has-file=distros/$SYSTEM.txt $SAGE_PACKAGE_LIST_ARGS) $EXTRA_SAGE_PACKAGES; do
     PKG_SCRIPTS="$SAGE_ROOT"/build/pkgs/$PKG_BASE
@@ -60,6 +60,9 @@ RUN $UPDATE $INSTALL software-properties-common && ($INSTALL gpg gpg-agent || ec
 RUN $SUDO add-apt-repository $EXTRA_REPOSITORY
 EOF
         fi
+        if [ -n "$EXTRA_PATH" ]; then
+            RUN="RUN export PATH=$EXTRA_PATH:\$PATH && "
+        fi
         ;;
     fedora*|redhat*|centos*)
         cat <<EOF
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		SageMath version 9.6.rc1, Release Date: 2022-04-19
		SageMath version 9.6.rc3, Release Date: 2022-04-29