Merge commit 'cc96c6dbae448cd361e798a1f29ec5bf10b0c57b' of git://trac.sagemath.org/sage into t/30580/sage_setup__remove_import_time_dependency___setup_requires___on__pkgconfig____numpy_

Author: Matthias Koeppe

.github/workflows/tox.yml

@@ -239,13 +239,13 @@ jobs:
         if: contains(matrix.tox_system_factor, 'nobootstrap')
       - name: Move homebrew away
         run: |
-          (cd /usr/local && for a in bin etc include lib opt sbin share; do mv $a $a-moved; done)
+          (cd /usr/local && for a in bin etc include lib opt sbin share; do sudo mv $a $a-moved; done)
       - name: Select Xcode version
         run: |
           if [ ${{ matrix.xcode_version_factor }} != default ]; then sudo xcode-select -s /Applications/Xcode_${{ matrix.xcode_version_factor }}.app; fi
       - name: Install test prerequisites
         run: |
-          /usr/bin/python3 -m pip install --user tox
+          sudo /usr/bin/python3 -m pip install tox
       - name: Install python3 from python.org
         # As of 2020-03-30 (https://github.com/actions/virtual-environments/blob/master/images/macos/macos-10.15-Readme.md),
         # Python 3.7.7 is installed on GitHub Actions runners.  But we install our own copy from the python.org binary package.

.gitignore

@@ -77,6 +77,9 @@ $RECYCLE.BIN/
 # SublimeText
 *.sublime-workspace
 
+# mypy
+**/.mypy_cache/
+
 #################
 # SageMathCloud #
 #################

.zenodo.json

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

README.md

@@ -173,9 +173,11 @@ Guide](https://doc.sagemath.org/html/en/installation).
 
     - [Git] Alternatively, clone the Sage git repository:
 
-            $ git clone -c core.symlinks=true --branch master git://trac.sagemath.org/sage.git
+            $ git clone -c core.symlinks=true --branch master https://github.com/sagemath/sage.git
 
-      This will create the subdirectory `sage`.
+      This will create the subdirectory `sage`. `cd sage/` and pick the branch you need
+      by doing `git checkout` - typically you want the latest development branch, thus do
+      `git checkout develop`.
 
     - [Windows] The Sage source tree contains symbolic links, and the
       build will not work if Windows line endings rather than UNIX

VERSION.txt

@@ -1 +1 @@
-SageMath version 9.2.rc2, Release Date: 2020-10-12
+SageMath version 9.3.beta0, Release Date: 2020-11-01

build/bin/sage-clone-source

@@ -35,6 +35,7 @@ git clone "$SRC" "$DST"
 
 cd "$DST"
 git remote set-url origin "$SAGE_REPO_ANONYMOUS"
+git remote set-url --push origin "$SAGE_REPO_AUTHENTICATED"
 
 # Save space
 git gc --aggressive --prune=now

build/bin/sage-spkg

@@ -489,6 +489,7 @@ export SAGE_ROOT="$SAGE_ROOT"
 export SAGE_SRC="$SAGE_SRC"
 export SAGE_PKG_DIR="$script_dir"
 export SAGE_SPKG_SCRIPTS="$SAGE_SPKG_SCRIPTS"
+export SAGE_SPKG_WHEELS="$SAGE_SPKG_WHEELS"
 
 export PKG_NAME="$PKG_NAME"
 export PKG_BASE="$PKG_BASE"
@@ -525,7 +526,7 @@ __EOF__
 }
 
 
-WRAPPED_SCRIPTS="build install check preinst postinst legacy-uninstall prerm postrm"
+WRAPPED_SCRIPTS="build install check preinst postinst prerm postrm"
 INSTALLED_SCRIPTS="prerm postrm"
 
 

build/bin/sage-spkg-info

@@ -40,7 +40,7 @@ for system_package_file in "$PKG_DISTROS"/*.txt; do
                 echo "$system:"
                 ;;
         esac
-        echo -n "  "
+        printf "  "
         sage-print-system-package-command $system --prompt --sudo install $system_packages
     fi
 done

build/bin/write-dockerfile.sh

@@ -17,8 +17,8 @@ for PKG_SCRIPTS in build/pkgs/*; do
     if [ -d $PKG_SCRIPTS ]; then
         PKG_BASE=$(basename $PKG_SCRIPTS)
         SYSTEM_PACKAGES_FILE=$PKG_SCRIPTS/distros/$SYSTEM.txt
-        PKG_TYPE=$(cat $PKG_SCRIPTS/type)
-        if [ -f $SYSTEM_PACKAGES_FILE -a -f $PKG_SCRIPTS/spkg-configure.m4 ]; then
+        if [ -f $PKG_SCRIPTS/type -a -f $SYSTEM_PACKAGES_FILE -a -f $PKG_SCRIPTS/spkg-configure.m4 ]; then
+           PKG_TYPE=$(cat $PKG_SCRIPTS/type)
            PKG_SYSTEM_PACKAGES=$(echo $(${STRIP_COMMENTS} $SYSTEM_PACKAGES_FILE))
            if [ -n "PKG_SYSTEM_PACKAGES" ]; then
                case "$PKG_TYPE" in

build/pkgs/_recommended/SPKG.txt

@@ -0,0 +1,6 @@
+= _recommended =
+
+== Description ==
+
+Script package representing a list of system packages recommended
+to be installed for additional functionality.