Merge branch 'u/saraedum/berkovich' of git://trac.sagemath.org/sage i…

…nto 29844

.ci/build-docker.sh

@@ -47,6 +47,9 @@ rsync html_/ html/ -a --copy-links
 
 # Build the release image without build artifacts.
 docker_build --target sagemath --tag "$DOCKER_IMAGE_CLI" .
+# Tag the sagemath:$DOCKER_TAG image that CI has just built as
+# sagemath:$COMMIT_HASH so we can refer to it uniquely later.
+docker tag "$DOCKER_IMAGE_CLI" "$DOCKER_IMAGE_BINDER"
 # Display the layers of this image
 docker history "$DOCKER_IMAGE_CLI"
 # Build the developer image with the build artifacts intact.

.ci/update-env.sh

@@ -45,6 +45,8 @@ fi
 export DOCKER_IMAGE_CLI=${DOCKER_NAMESPACE:-sagemath}/sagemath:$DOCKER_TAG
 export DOCKER_IMAGE_DEV=${DOCKER_NAMESPACE:-sagemath}/sagemath-dev:$DOCKER_TAG
 
+export DOCKER_IMAGE_BINDER="${DOCKER_NAMESPACE:-sagemath}/sagemath:${CI_COMMIT_SHA}"
+
 # Seed the build cache with this image (set to source-clean to build from
 # scratch.)
 export ARTIFACT_BASE=${ARTIFACT_BASE:-$DEFAULT_ARTIFACT_BASE}

.github/workflows/tox-gcc_spkg.yml

@@ -36,7 +36,7 @@ jobs:
       fail-fast: false
       matrix:
         tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-eoan, ubuntu-focal, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, centos-7, centos-8, archlinux-latest, slackware-14.2, conda-forge, ubuntu-bionic-i386, ubuntu-eoan-i386, debian-buster-i386, centos-7-i386]
-        tox_packages_factor: [minimal-gcc_spkg, standard-gcc_spkg, standard-python2-gcc_spkg]
+        tox_packages_factor: [minimal-gcc_spkg, standard-gcc_spkg]
     env:
       TOX_ENV: docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
       LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
@@ -101,7 +101,7 @@ jobs:
       fail-fast: false
       matrix:
         tox_system_factor: [conda-forge-ubuntu]
-        tox_packages_factor: [minimal-gcc_spkg, standard-gcc_spkg, standard-python2-gcc_spkg]
+        tox_packages_factor: [minimal-gcc_spkg, standard-gcc_spkg]
     env:
       TOX_ENV: local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
       LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}

.github/workflows/tox-optional.yml

@@ -102,7 +102,7 @@ jobs:
       fail-fast: false
       max-parallel: 3
       matrix:
-        tox_system_factor: [homebrew-macos-python2, homebrew-macos, homebrew-macos-python3_xcode, homebrew-macos-python3_xcode-nokegonly, homebrew-macos-python3_pythonorg, conda-forge-macos]
+        tox_system_factor: [homebrew-macos, homebrew-macos-python3_xcode, homebrew-macos-python3_xcode-nokegonly, homebrew-macos-python3_pythonorg, conda-forge-macos]
         tox_packages_factor: [maximal]
     env:
       TOX_ENV: local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}

.github/workflows/tox.yml

@@ -37,7 +37,7 @@ jobs:
       max-parallel: 20
       matrix:
         tox_system_factor: [ubuntu-trusty, ubuntu-xenial, ubuntu-bionic, ubuntu-eoan, ubuntu-focal, debian-jessie, debian-stretch, debian-buster, debian-bullseye, debian-sid, linuxmint-17, linuxmint-18, linuxmint-19, linuxmint-19.3, fedora-26, fedora-27, fedora-28, fedora-29, fedora-30, fedora-31, fedora-32, centos-7, centos-8, archlinux-latest, slackware-14.2, conda-forge, ubuntu-bionic-i386, ubuntu-eoan-i386, debian-buster-i386, centos-7-i386]
-        tox_packages_factor: [minimal, standard, standard-python2]
+        tox_packages_factor: [minimal, standard]
     env:
       TOX_ENV: docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
       LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-docker-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
@@ -102,7 +102,7 @@ jobs:
       fail-fast: false
       max-parallel: 4
       matrix:
-        tox_system_factor: [homebrew-macos-python2, homebrew-macos, homebrew-macos-python3_xcode, homebrew-macos-python3_xcode-nokegonly, homebrew-macos-python3_pythonorg, homebrew-macos-python3_xcode-gcc_spkg, conda-forge-macos]
+        tox_system_factor: [homebrew-macos, homebrew-macos-python3_xcode, homebrew-macos-python3_xcode-nokegonly, homebrew-macos-python3_pythonorg, homebrew-macos-python3_xcode-gcc_spkg, conda-forge-macos]
         tox_packages_factor: [minimal, standard]
     env:
       TOX_ENV: local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
@@ -147,7 +147,7 @@ jobs:
       max-parallel: 1
       matrix:
         tox_system_factor: [conda-forge-ubuntu]
-        tox_packages_factor: [minimal, standard, standard-python2]
+        tox_packages_factor: [minimal, standard]
     env:
       TOX_ENV: local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}
       LOGS_ARTIFACT_NAME: logs-commit-${{ github.sha }}-tox-local-${{ matrix.tox_system_factor }}-${{ matrix.tox_packages_factor }}

.gitlab-ci.yml

@@ -37,7 +37,7 @@
 # If you want to provide your own runners, make sure to tag them as follows:
 # * "big" (60GB of disk space are available) to make build-from-clean pass.
 
-image: docker:latest
+image: docker:stable
 
 stages:
   - build
@@ -77,7 +77,7 @@ before_script:
 # better isolation. If you expect many builds to run simultaneously on a host,
 # conflicting tags can cause issues with a mounted DOCKER_HOST.
 services:
-- docker:18.05.0-ce-dind
+- docker:stable-dind
 
 # Build Sage and its documentation.
 # The build starts from the build artifacts of DEFAULT_ARTIFACT_BASE which is
@@ -100,6 +100,7 @@ build-from-latest:
     - .ci/build-docker.sh | tee gitlab-build-docker.log | .ci/head-tail.sh 1048576
     - .ci/push-gitlab.sh sagemath-dev
     - .ci/push-gitlab.sh sagemath
+    - DOCKER_TAG=$CI_COMMIT_SHA .ci/push-gitlab.sh sagemath
   except:
     - master
     - develop

Makefile

@@ -42,7 +42,7 @@ SPKG_COLLECT_FILES = build/pkgs/*/type build/pkgs/*/package-version.txt build/pk
 
 # If configure was run before, rerun it with the old arguments.
 # Otherwise, run configure with argument $PREREQ_OPTIONS.
-build/make/Makefile: configure build/make/deps $(SPKG_COLLECT_FILES) $(CONFIG_FILES:%=%.in)
+build/make/Makefile: configure $(SPKG_COLLECT_FILES) $(CONFIG_FILES:%=%.in)
 	rm -f config.log
 	mkdir -p logs/pkgs
 	ln -s logs/pkgs/config.log config.log
@@ -105,6 +105,7 @@ distclean: build-clean
 bootstrap-clean:
 	rm -rf config configure build/make/Makefile-auto.in
 	rm -f src/doc/en/installation/*.txt
+	rm -rf src/doc/en/reference/spkg/*.rst
 
 # Remove absolutely everything which isn't part of the git repo
 maintainer-clean: distclean bootstrap-clean

VERSION.txt

@@ -1 +1 @@
-SageMath version 9.1, Release Date: 2020-05-20
+SageMath version 9.2.beta1, Release Date: 2020-06-13

bootstrap

@@ -160,7 +160,7 @@ save () {
     # Create configure tarball
     echo "Creating $NEWCONFBALL..."
     mkdir -p upstream
-    tar zcf "$NEWCONFBALL" configure config/* build/make/Makefile-auto.in src/doc/en/installation/*.txt
+    tar zcf "$NEWCONFBALL" configure config/* build/make/Makefile-auto.in src/doc/en/installation/*.txt src/doc/en/reference/spkg/*.rst
 
     # Update version
     echo "$NEWCONFVERSION" >$PKG/package-version.txt

build/bin/sage-build-env-config.in

@@ -87,5 +87,6 @@ export SAGE_PARI_CFG="@SAGE_PARI_CFG@"
 
 export SAGE_GLPK_PREFIX="@SAGE_GLPK_PREFIX@"
 export SAGE_FREETYPE_PREFIX="@SAGE_FREETYPE_PREFIX@"
+export SAGE_SUITESPARSE_PREFIX="@SAGE_SUITESPARSE_PREFIX@"
 
 export SAGE_CONFIGURE_FFLAS_FFPACK="@SAGE_CONFIGURE_FFLAS_FFPACK@"

build/bin/sage-spkg

@@ -361,52 +361,7 @@ EOF
 fi
 
 if [ $INFO -ne 0 -a "$USE_LOCAL_SCRIPTS" = yes ]; then
-    cat "$PKG_SCRIPTS/SPKG.txt"
-    if [ -r "$PKG_SCRIPTS/type" ] ; then
-        echo
-        echo "== Type =="
-        echo
-        cat "$PKG_SCRIPTS/type"
-        echo
-    fi
-    echo "== Equivalent System Packages =="
-    echo
-    PKG_DISTROS="$PKG_SCRIPTS"/distros
-    for system_package_file in "$PKG_DISTROS"/*.txt; do
-        if [ -f "$system_package_file" ]; then
-            system=$(basename "$system_package_file" .txt)
-            system_packages="$(echo $(sed 's/#.*//;' $system_package_file))"
-            case $system in
-                debian)
-                    # Generic
-                    echo "Debian/Ubuntu:"
-                    ;;
-                fedora)
-                    # Generic
-                    echo "Fedora/Redhat/CentOS:"
-                    ;;
-                *)
-                    echo "$system:"
-                    ;;
-            esac
-            echo -n "  "
-            sage-print-system-package-command $system --prompt --sudo install $system_packages
-        fi
-    done
-    if [ -z "$system" ]; then
-        echo "(none known)"
-    else
-        echo
-        if [ -f "$PKG_SCRIPTS"/spkg-configure.m4 ]; then
-            echo "If the system package is installed, ./configure will check whether it can be used."
-        else
-            echo "However, these system packages will not be used for building Sage"
-            echo "because spkg-configure.m4 has not been written for this package;"
-            echo "see https://trac.sagemath.org/ticket/27330"
-        fi
-    fi
-    echo
-    exit 0
+    exec sage-spkg-info $PKG_BASE
 fi
 
 # If we haven't found the package yet, we must download it

build/bin/sage-spkg-info

@@ -0,0 +1,59 @@
+#!/usr/bin/env bash
+#
+#  sage-spkg-info SPKG
+#  Format information about a Sage package
+#
+#  Assumes SAGE_ROOT is set
+PKG_BASE=$1
+PKG_SCRIPTS="$SAGE_ROOT/build/pkgs/$PKG_BASE"
+for ext in rst txt; do
+    SPKG_FILE="$PKG_SCRIPTS/SPKG.$ext"
+    if [ -f "$SPKG_FILE" ]; then
+        cat "$SPKG_FILE"
+        break
+    fi
+done
+if [ -r "$PKG_SCRIPTS/type" ] ; then
+    echo
+    echo "== Type =="
+    echo
+    cat "$PKG_SCRIPTS/type"
+    echo
+fi
+echo "== Equivalent System Packages =="
+echo
+PKG_DISTROS="$PKG_SCRIPTS"/distros
+for system_package_file in "$PKG_DISTROS"/*.txt; do
+    if [ -f "$system_package_file" ]; then
+        system=$(basename "$system_package_file" .txt)
+        system_packages="$(echo $(sed 's/#.*//;' $system_package_file))"
+        case $system in
+            debian)
+                # Generic
+                echo "Debian/Ubuntu:"
+                ;;
+            fedora)
+                # Generic
+                echo "Fedora/Redhat/CentOS:"
+                ;;
+            *)
+                echo "$system:"
+                ;;
+        esac
+        echo -n "  "
+        sage-print-system-package-command $system --prompt --sudo install $system_packages
+    fi
+done
+if [ -z "$system" ]; then
+    echo "(none known)"
+else
+    echo
+    if [ -f "$PKG_SCRIPTS"/spkg-configure.m4 ]; then
+        echo "If the system package is installed, ./configure will check whether it can be used."
+    else
+        echo "However, these system packages will not be used for building Sage"
+        echo "because spkg-configure.m4 has not been written for this package;"
+        echo "see https://trac.sagemath.org/ticket/27330"
+    fi
+fi
+echo