Merge tag '9.3.beta0' into t/30709/public/build/cythonConfig

SageMath version 9.3.beta0, Release Date: 2020-11-01

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

@@ -0,0 +1,27 @@
+{
+    "description": "Mirror of the Sage https://sagemath.org/ source tree", 
+    "license": "other-open", 
+    "title": "sagemath/sage: 9.3.beta0", 
+    "version": "9.3.beta0", 
+    "upload_type": "software", 
+    "publication_date": "2020-11-01", 
+    "creators": [
+        {
+            "affiliation": "SageMath.org", 
+            "name": "The SageMath Developers"
+        }
+    ], 
+    "access_right": "open", 
+    "related_identifiers": [
+        {
+            "scheme": "url", 
+            "identifier": "https://github.com/sagemath/sage/tree/9.3.beta0", 
+            "relation": "isSupplementTo"
+        }, 
+        {
+            "scheme": "doi", 
+            "identifier": "10.5281/zenodo.593563", 
+            "relation": "isVersionOf"
+        }
+    ]
+}

.zenodo.json.in

@@ -0,0 +1,27 @@
+{
+    "description": "Mirror of the Sage https://sagemath.org/ source tree", 
+    "license": "other-open", 
+    "title": "sagemath/sage: ${SAGE_VERSION}", 
+    "version": "${SAGE_VERSION}", 
+    "upload_type": "software", 
+    "publication_date": "${SAGE_RELEASE_DATE}", 
+    "creators": [
+        {
+            "affiliation": "SageMath.org", 
+            "name": "The SageMath Developers"
+        }
+    ], 
+    "access_right": "open", 
+    "related_identifiers": [
+        {
+            "scheme": "url", 
+            "identifier": "https://github.com/sagemath/sage/tree/${SAGE_VERSION}", 
+            "relation": "isSupplementTo"
+        }, 
+        {
+            "scheme": "doi", 
+            "identifier": "10.5281/zenodo.593563", 
+            "relation": "isVersionOf"
+        }
+    ]
+}

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.beta14, Release Date: 2020-09-30
+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-get-system-packages

@@ -1,7 +1,7 @@
 #!/bin/sh
 SYSTEM=$1
 if [ -z "$SYSTEM" ]; then
-   echo >&2 "usage: $0 {debian|arch|conda|...} SPKGS..."
+   echo >&2 "usage: $0 {debian|arch|conda|pip|...} SPKGS..."
    exit 1
 fi
 shift
@@ -10,9 +10,18 @@ SPKGS="$*"
 if [ -z "$SAGE_ROOT" ]; then
     SAGE_ROOT=`pwd`
 fi
-STRIP_COMMENTS="sed s/#.*//;"
+case "$SYSTEM" in
+    pip)
+        SYSTEM_PACKAGES_FILE_NAME="requirements.txt"
+        STRIP_COMMENTS='sed s/#.*//;s/[[:space:]]//g;'
+        ;;
+    *)
+        SYSTEM_PACKAGES_FILE_NAME="distros/$SYSTEM.txt"
+        STRIP_COMMENTS="sed s/#.*//;"
+        ;;
+esac
 for PKG_BASE in $SPKGS; do
-    SYSTEM_PACKAGES_FILE=$SAGE_ROOT/build/pkgs/$PKG_BASE/distros/$SYSTEM.txt
+    SYSTEM_PACKAGES_FILE="$SAGE_ROOT"/build/pkgs/$PKG_BASE/$SYSTEM_PACKAGES_FILE_NAME
     if [ -f $SYSTEM_PACKAGES_FILE ]; then
        echo $(${STRIP_COMMENTS} $SYSTEM_PACKAGES_FILE)
     fi

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

@@ -15,11 +15,14 @@ do
             # Whether to print sudo for package managers that need sudo for non-root users
             SUDO="sudo "
             ;;
+        --prompt=*)
+            PROMPT=${1#--prompt=}
+            ;;
         --prompt)
             PROMPT='  $ '
             ;;
         -*)
-            echo >&2 "$0: unknown option $2"
+            echo >&2 "$0: unknown option $1"
             exit 1
             ;;
         *)
@@ -86,6 +89,9 @@ case $system:$command in
     freebsd*:install)
         [ -n "$system_packages" ] && echo "${PROMPT}${SUDO}pkg install $system_packages"
         ;;
+    pip:install)
+        [ -n "$system_packages" ] && echo "${PROMPT}sage -pip install $system_packages"
+        ;;
     *:update)
         # Nothing needed
         ;;

build/bin/sage-spkg

@@ -181,6 +181,9 @@ if [ -z "$SAGE_BUILD_DIR" ]; then
     export SAGE_BUILD_DIR="$SAGE_LOCAL/var/tmp/sage/build"
 fi
 
+export SAGE_SPKG_INST="$SAGE_LOCAL/var/lib/sage/installed"
+export SAGE_SPKG_SCRIPTS="$SAGE_LOCAL/var/lib/sage/scripts"
+export SAGE_SPKG_WHEELS="$SAGE_LOCAL/var/lib/sage/wheels"
 
 # Remove '.' from PYTHONPATH, to avoid trouble with setuptools / easy_install
 # (cf. #10192, #10176):
@@ -486,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"
@@ -522,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"