Merge tag '9.3.beta7' into t/31064/ci_cygwin__yml__adjust_to_new_script_packages__bootstrap___prereq

SageMath version 9.3.beta7, Release Date: 2021-02-07

Author: Matthias Koeppe

.github/workflows/ci-cygwin-minimal.yml

@@ -6,6 +6,8 @@ on:
   push:
     tags:
       - '*'
+  workflow_dispatch:
+    # Allow to run manually
 
 env:
   MAKE: make -j8

.github/workflows/ci-cygwin-standard.yml

@@ -6,6 +6,8 @@ on:
   push:
     tags:
       - '*'
+  workflow_dispatch:
+    # Allow to run manually
 
 env:
   MAKE: make -j8

.github/workflows/ci-wsl.yml

@@ -9,6 +9,7 @@ on:
     branches:
       - 'public/build/**wsl**'
   workflow_dispatch:
+    # Allow to run manually
 
 jobs:
   windows:

.github/workflows/lint.yml

@@ -16,7 +16,7 @@ jobs:
     - name: Install pycodestyle
       run: pip install tox pycodestyle
     - name: Lint using pycodestyle
-      run: tox -e pycodestyle
+      run: tox -e pycodestyle-minimal
   lint-relint:
     name: Code style check with relint
     runs-on: ubuntu-latest
@@ -27,7 +27,7 @@ jobs:
       uses: actions/setup-python@v2
       with:
         python-version: 3.8
-    - name: Install pycodestyle
+    - name: Install relint
       run: pip install tox relint
     - name: Lint using relint
       run: tox -e relint src/

.github/workflows/tox-experimental.yml

@@ -23,6 +23,8 @@ on:
   push:
     tags:
       - '*'
+  workflow_dispatch:
+    # Allow to run manually
 
 env:
   TARGETS_PRE: build/make/Makefile

.github/workflows/tox-gcc_spkg.yml

@@ -23,6 +23,8 @@ on:
   push:
     tags:
       - '*'
+  workflow_dispatch:
+    # Allow to run manually
 
 env:
   TARGETS_PRE: sagelib-build-deps

.github/workflows/tox-optional.yml

@@ -23,6 +23,8 @@ on:
   push:
     tags:
       - '*'
+  workflow_dispatch:
+    # Allow to run manually
 
 env:
   TARGETS_PRE: build/make/Makefile

.github/workflows/tox.yml

@@ -23,6 +23,8 @@ on:
   push:
     tags:
       - '*'
+  workflow_dispatch:
+    # Allow to run manually
 
 env:
   TARGETS_PRE: sagelib-build-deps

.zenodo.json

@@ -1,10 +1,10 @@
 {
     "description": "Mirror of the Sage https://sagemath.org/ source tree", 
     "license": "other-open", 
-    "title": "sagemath/sage: 9.3.beta5", 
-    "version": "9.3.beta5", 
+    "title": "sagemath/sage: 9.3.beta7", 
+    "version": "9.3.beta7", 
     "upload_type": "software", 
-    "publication_date": "2020-12-27", 
+    "publication_date": "2021-02-07", 
     "creators": [
         {
             "affiliation": "SageMath.org", 
@@ -15,7 +15,7 @@
     "related_identifiers": [
         {
             "scheme": "url", 
-            "identifier": "https://github.com/sagemath/sage/tree/9.3.beta5", 
+            "identifier": "https://github.com/sagemath/sage/tree/9.3.beta7", 
             "relation": "isSupplementTo"
         }, 
         {

Makefile

@@ -259,9 +259,11 @@ install: all
 	@echo "from https://github.com/sagemath/binary-pkg"
 	@echo "******************************************************************"
 
+# Setting SAGE_PKGCONFIG is only so that make does not exit with
+# "This Makefile needs to be invoked by build/make/install".
 list:
 	@$(MAKE) --silent build/make/Makefile >&2
-	@$(MAKE) --silent -f build/make/Makefile SAGE_SPKG_INST=local $@
+	@$(MAKE) --silent -f build/make/Makefile SAGE_PKGCONFIG=dummy $@
 
 .PHONY: default build dist install micro_release \
 	misc-clean bdist-clean distclean bootstrap-clean maintainer-clean \

README.md

@@ -328,8 +328,9 @@ version that you are installing.
 Please do not hesitate to ask for help in the [SageMath forum
 ](https://ask.sagemath.org/questions/) or the [sage-support mailing
 list](https://groups.google.com/forum/#!forum/sage-support).  The
-[Troubleshooting section in the Sage Installation Guide]() provides
-instructions on what information to provide so that we can provide
+[Troubleshooting section in the Sage Installation Guide
+](https://doc.sagemath.org/html/en/installation/troubles.html)
+provides instructions on what information to provide so that we can provide
 help more effectively.
 
 Contributing to Sage

VERSION.txt

@@ -1 +1 @@
-SageMath version 9.3.beta5, Release Date: 2020-12-27
+SageMath version 9.3.beta7, Release Date: 2021-02-07

build/bin/sage-dist-helpers

@@ -148,7 +148,7 @@ _EOF_
 
 
 sdh_guard() {
-    sdh_check_vars SAGE_ROOT SAGE_LOCAL SAGE_SHARE
+    sdh_check_vars SAGE_ROOT SAGE_LOCAL SAGE_INST_LOCAL SAGE_SHARE
 }
 
 
@@ -160,9 +160,9 @@ sdh_configure() {
     if [ -z "$CONFIG_SHELL" ]; then
         export CONFIG_SHELL=`command -v bash`
     fi
-    ./configure --prefix="$SAGE_LOCAL" --libdir="$SAGE_LOCAL/lib" --disable-maintainer-mode --disable-dependency-tracking "$@"
+    ./configure --prefix="$SAGE_INST_LOCAL" --libdir="$SAGE_INST_LOCAL/lib" --disable-maintainer-mode --disable-dependency-tracking "$@"
     if [ $? -ne 0 ]; then # perhaps it is a non-autoconf'd project
-      ./configure --prefix="$SAGE_LOCAL" --libdir="$SAGE_LOCAL/lib" "$@"
+      ./configure --prefix="$SAGE_INST_LOCAL" --libdir="$SAGE_INST_LOCAL/lib" "$@"
       if [ $? -ne 0 ]; then
         if [ -f "$(pwd)/config.log" ]; then
             sdh_die <<_EOF_
@@ -204,7 +204,7 @@ sdh_setup_bdist_wheel() {
     mkdir -p dist
     rm -f dist/*.whl
     BDIST_DIR="$(mktemp -d)"
-    sage-python23 setup.py --no-user-cfg \
+    python3 setup.py --no-user-cfg \
          bdist_wheel --bdist-dir "$BDIST_DIR" \
          "$@" || sdh_die "Error building a wheel for $PKG_NAME"
 }
@@ -221,7 +221,7 @@ sdh_pip_install() {
 
     mkdir -p dist
     rm -f dist/*.whl
-    sage-python23 -m pip wheel --wheel-dir=dist --no-binary :all: --verbose --no-deps --no-index --isolated --no-build-isolation "$@" || \
+    python3 -m pip wheel --wheel-dir=dist --no-binary :all: --verbose --no-deps --no-index --isolated --no-build-isolation "$@" || \
         sdh_die "Error building a wheel for $PKG_NAME"
 
     sdh_store_and_pip_install_wheel .
@@ -261,7 +261,7 @@ sdh_store_and_pip_install_wheel() {
 
 sdh_cmake() {
     echo "Configuring $PKG_NAME with cmake"
-    cmake . -DCMAKE_INSTALL_PREFIX="${SAGE_LOCAL}" \
+    cmake . -DCMAKE_INSTALL_PREFIX="${SAGE_INST_LOCAL}" \
             -DCMAKE_INSTALL_LIBDIR=lib \
             "$@"
     if [ $? -ne 0 ]; then

build/bin/sage-pip-install

@@ -14,11 +14,14 @@
 #                      ~/.pydistutils.cfg
 pip_install_flags="--ignore-installed --verbose --no-deps --no-index --isolated"
 
-# Note: We need to take care to specify the full path to Sage's Python here
-# to emphasize that this command should use it, and not the system Python;
-# see https://trac.sagemath.org/ticket/18438
-# But now we delegate this to sage-python23.
-PYTHON=sage-python23
+# Note: "sage-pip-install" is meant to be run after $(PYTHON) has
+# been installed (either as an spkg or as a venv over a system python3).
+# It is then guaranteed by sage-env that PATH is set in a way that "python3"
+# refers to the correct python3.
+#
+# All SPKGs that use this script must therefore declare $(PYTHON) as a
+# dependency.
+PYTHON=python3
 
 # The PIP variable is only used to determine the name of the lock file.
 PIP=pip3

build/bin/sage-pip-uninstall

@@ -12,11 +12,11 @@ if [ "$1" != "." ]; then
     exit 1
 fi
 
-# Note: We need to take care to specify the full path to Sage's Python here
-# to emphasize that this command should use it, and not the system Python;
-# see https://trac.sagemath.org/ticket/18438
-# But now we delegate this to sage-python23.
-PYTHON=sage-python23
+# Note: "sage-pip-uninstall" is meant to be run after $(PYTHON) has
+# been installed (either as an spkg or as a venv over a system python3).
+# It is then guaranteed by sage-env that PATH is set in a way that "python3"
+# refers to the correct python3.
+PYTHON=python3
 
 # The PIP variable is only used to determine the name of the lock file.
 PIP=pip3

build/bin/sage-print-system-package-command

@@ -120,6 +120,9 @@ case $system:$command in
     freebsd*:install)
         [ -n "$system_packages" ] && echo "${PROMPT}${SUDO}pkg install $system_packages"
         ;;
+    nix*:install)
+        [ -n "$system_packages" ] && echo "${PROMPT}nix-env --install $system_packages"
+        ;;
     pip:install)
         [ -n "$system_packages" ] && echo "${PROMPT}sage -pip install $system_packages"
         ;;

build/bin/sage-python23

@@ -2,7 +2,8 @@
 
 ########################################################
 # Build Sage source distribution
-# This script should be called by the spkg/bin/sage script
+# This script should not be invoked directly.
+# Use "sage --sdist" or "make dist".
 ########################################################
 
 set -e