Merge branch 't/30383/new_package_type__optional_enabled_by_default' into t/31409/cygwin_standard__r_build_fails_____downgrade_r__rpy2_to_optional

Author: Matthias Koeppe

.github/workflows/tox.yml

@@ -108,6 +108,15 @@ jobs:
         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]
         xcode_version_factor: [11.7, 12.2, default, 12.4]
+        include:
+          - tox_system_factor: conda-forge-macos
+            tox_packages_factor: environment
+            xcode_version_factor: default
+            os: macos-11.0
+          - tox_system_factor: conda-forge-macos
+            tox_packages_factor: environment-optional
+            xcode_version_factor: default
+            os: macos-11.0
     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 }}-${{ matrix.os }}-xcode_${{ matrix.xcode_version_factor }}
@@ -154,7 +163,7 @@ jobs:
       max-parallel: 1
       matrix:
         tox_system_factor: [conda-forge-ubuntu]
-        tox_packages_factor: [minimal, standard]
+        tox_packages_factor: [minimal, standard, environment, environment-optional]
     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 }}
@@ -196,7 +205,7 @@ jobs:
       - name: Install bootstrap prerequisites
         run: |
           sudo DEBIAN_FRONTEND=noninteractive apt-get update
-          sudo DEBIAN_FRONTEND=noninteractive apt-get install $(sed "s/#.*//;" build/pkgs/debian-bootstrap.txt)
+          sudo DEBIAN_FRONTEND=noninteractive apt-get install $(build/bin/sage-get-system-packages debian _bootstrap)
       - name: Bootstrap with sage-update-version
         # We set SAGE_ROOT and SAGE_SRC by hand
         # because 'sage -sh' does not work with an unconfigured tree,

.gitignore

@@ -118,6 +118,7 @@ src/sage/modular/arithgroup/farey_symbol.h
 !src/sage/stats/distributions/dgs_bern.c
 !src/sage/stats/distributions/dgs_gauss_dp.c
 !src/sage/stats/distributions/dgs_gauss_mp.c
+/src/cython_debug
 
 # Temporary build files
 build/temp.*/

.homebrew-build-env

@@ -23,7 +23,7 @@ export PKG_CONFIG_PATH
 LIBRARY_PATH="$HOMEBREW/lib$LIBRARY_PATH"
 [ -z "$CPATH" ] || CPATH=":${CPATH}"
 CPATH="$HOMEBREW/include$CPATH"
-for l in readline bzip2; do
+for l in readline bzip2 ntl; do
     if [ -d "$HOMEBREW/opt/$l/lib" ]; then
         LIBRARY_PATH="$HOMEBREW/opt/$l/lib:$LIBRARY_PATH"
     fi

.zenodo.json

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

COPYING.txt

@@ -130,7 +130,6 @@ symmetrica                  MIT-like License (see below)
 sympow                      Modified BSD
 sympy                       Modified BSD
 tachyon                     Modified BSD
-termcap                     GPLv2+
 threejs                     MIT License
 tornado                     Apache License
 zlib                        Custom (Modified BSD)

README.md

@@ -219,9 +219,9 @@ Guide](https://doc.sagemath.org/html/en/installation).
    * Build tools: GNU `make`, GNU `m4`, `perl` (including
      ``ExtUtils::MakeMaker``), `ranlib`, `git`, `tar`, `bc`
 
-   * Any version of `python` (full installation including `urllib`),
-     but ideally version 3.7.x or 3.8.x, which will avoid having to build Sage's
-     own copy of Python 3.
+   * Python 3.4 or later, or Python 2.7, a full installation including
+     `urllib`; but ideally version 3.7.x, 3.8.x, or 3.9.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
    prerequisites. See [build/pkgs/arch.txt](build/pkgs/arch.txt),

VERSION.txt

@@ -1 +1 @@
-SageMath version 9.3.beta8, Release Date: 2021-03-07
+SageMath version 9.3.beta9, Release Date: 2021-03-14

build/bin/sage-bootstrap-python

@@ -17,6 +17,9 @@ fi
 # So it needs to find a python that has the urllib module.
 # For example, on Debian buster, the python3-minimal package does NOT provide it.
 #
+# Also, Trac #20023 removed the vendored argparse library from sage_bootstrap,
+# so we test that python is new enough (>= 2.7) to run it.
+#
 # See https://trac.sagemath.org/ticket/29090
 
 # Trac #29890: Our first choice is "python", not "python3". This is to avoid
@@ -41,7 +44,7 @@ PYTHONS="python python3 python3.8 python3.7 python2.7 python3.6 python2"
 for PY in $PYTHONS; do
     PYTHON="$(PATH="$SAGE_ORIG_PATH" command -v $PY)"
     if [ -n "$PYTHON" ]; then
-        if "$PYTHON" -c "import urllib; from hashlib import sha1; from os import listdir; listdir(\"$(pwd)\");" 2>/dev/null; then
+        if "$PYTHON" -c "import argparse; import urllib; from hashlib import sha1; from os import listdir; listdir(\"$(pwd)\");" 2>/dev/null; then
             exec "$PYTHON" "$@"
         fi
     fi

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

@@ -106,3 +106,5 @@ export SAGE_FREETYPE_PREFIX="@SAGE_FREETYPE_PREFIX@"
 export SAGE_SUITESPARSE_PREFIX="@SAGE_SUITESPARSE_PREFIX@"
 
 export SAGE_CONFIGURE_FFLAS_FFPACK="@SAGE_CONFIGURE_FFLAS_FFPACK@"
+
+export SAGE_EDITABLE="@SAGE_EDITABLE@"

build/bin/sage-site

@@ -162,7 +162,7 @@ if [ "$1" = "-docbuild" -o "$1" = "--docbuild" ]; then
         export OMP_NUM_THREADS=1
     fi
 
-    exec sage-python -m sage_setup.docbuild "$@" </dev/null
+    exec sage-python -m sage_docbuild "$@" </dev/null
 fi
 
 if [ "$1" = '-git-branch' -o "$1" = '--git-branch' ]; then