Merge #32416

Author: Matthias Koeppe

.github/workflows/lint.yml

@@ -31,17 +31,3 @@ jobs:
       run: pip install tox relint
     - name: Lint using relint
       run: tox -e relint src/sage/
-  lint-pyright:
-    name: Static type check with pyright
-    runs-on: ubuntu-latest
-    steps:
-    - name: Checkout
-      uses: actions/checkout@v2
-    - name: Set up node to install pyright
-      uses: actions/setup-node@v1
-      with:
-        node-version: '12'
-    - name: Install pyright
-      run: npm install -g pyright
-    - name: Lint using pyright
-      run: pyright

.zenodo.json

@@ -1,10 +1,10 @@
 {
     "description": "Mirror of the Sage https://sagemath.org/ source tree", 
     "license": "other-open", 
-    "title": "sagemath/sage: 9.5.beta1", 
-    "version": "9.5.beta1", 
+    "title": "sagemath/sage: 9.5.beta2", 
+    "version": "9.5.beta2", 
     "upload_type": "software", 
-    "publication_date": "2021-09-13", 
+    "publication_date": "2021-09-26", 
     "creators": [
         {
             "affiliation": "SageMath.org", 
@@ -15,7 +15,7 @@
     "related_identifiers": [
         {
             "scheme": "url", 
-            "identifier": "https://github.com/sagemath/sage/tree/9.5.beta1", 
+            "identifier": "https://github.com/sagemath/sage/tree/9.5.beta2", 
             "relation": "isSupplementTo"
         }, 
         {

VERSION.txt

@@ -1 +1 @@
-SageMath version 9.5.beta1, Release Date: 2021-09-13
+SageMath version 9.5.beta2, Release Date: 2021-09-26

build/bin/sage-dist-helpers

@@ -240,7 +240,7 @@ sdh_pip_install() {
     echo "Installing $PKG_NAME"
     mkdir -p dist
     rm -f dist/*.whl
-    python3 -m pip wheel --use-feature=in-tree-build --wheel-dir=dist --no-binary :all: --verbose --no-deps --no-index --isolated --no-build-isolation "$@" || \
+    python3 -m pip wheel --use-feature=in-tree-build --wheel-dir=dist --no-binary :all: --verbose --no-deps --no-index --isolated --no-build-isolation --ignore-requires-python "$@" || \
         sdh_die "Error building a wheel for $PKG_NAME"
 
     sdh_store_and_pip_install_wheel .
@@ -275,6 +275,17 @@ sdh_store_wheel() {
 }
 
 sdh_store_and_pip_install_wheel() {
+    local pip_options=""
+    while [ $# -gt 0 ]; do
+        case $1 in
+            -*) pip_options="$pip_options $1"
+                ;;
+            *)
+                break
+                ;;
+        esac
+        shift
+    done
     sdh_store_wheel "$@"
     if [ -n "$SAGE_SUDO" ]; then
         # Trac #29585: Do the SAGE_DESTDIR staging of the wheel installation
@@ -295,7 +306,7 @@ sdh_store_and_pip_install_wheel() {
         local sudo=""
         local root=""
     fi
-    $sudo sage-pip-install $root "$wheel" || \
+    $sudo sage-pip-install $root $pip_options "$wheel" || \
         sdh_die "Error installing ${wheel##*/}"
     if [ -n "${SAGE_PKG_DIR}" ]; then
         # Record name of installed distribution name for uninstallation.

build/bin/sage-pip-install

@@ -3,16 +3,15 @@
 # built wheel.
 
 # Default arguments for all packages installed with `pip install`
-# --ignore-installed : Force pip to re-install package even if it thinks it's
-#                      already installed (for which it sometimes gets false
-#                      positives for partially-installed packages).
 # --verbose          : Display the output when running setup.py.
-# --no-deps          : Don't install runtime dependencies from PyPI.
 # --no-index         : Don't look at the package index.
-#                      This also disables pip's version self-check.
+# --disable-pip-version-check : Disables pip's version self-check.
 # --isolated         : Don't read configuration files such as
 #                      ~/.pydistutils.cfg
-pip_install_flags="--ignore-installed --verbose --no-deps --no-index --isolated"
+# --no-cache-dir     : Disable the cache.
+#                      (so that no previously built wheels can sneak in to
+#                      resolve runtime dependencies)
+pip_install_flags="--verbose --no-index --find-links=$SAGE_SPKG_WHEELS --disable-pip-version-check --isolated --no-cache-dir"
 
 # 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).
@@ -35,6 +34,17 @@ LOCK="$SAGE_LOCAL/var/lock/$PIP.lock"
 # to apply a shared lock)
 sage-flock -s $LOCK $PYTHON -m pip install $pip_install_flags "$@"
 if [ $? -ne 0 ]; then
-    echo >&2 "Error: installing with $PIP failed"
-    exit 3
+    # --ignore-installed : Force pip to re-install package even if it thinks it's
+    #                      already installed (for which it sometimes gets false
+    #                      positives for partially-installed packages).
+    # --no-deps          : Don't install runtime dependencies from PyPI.
+    extra_pip_install_flags="--no-deps --ignore-installed --ignore-requires-python"
+    echo >&2 "Warning: installing with \"$PYTHON -m pip install $pip_install_flags\" failed. Retrying, adding \"$extra_pip_install_flags\""
+    sage-flock -s $LOCK $PYTHON -m pip install $pip_install_flags $extra_pip_install_flags "$@"
+    if [ $? -ne 0 ]; then
+        echo >&2 "Error: installing with pip  failed"
+        exit 3
+    else
+        echo >&2 "Warning: The installation needed to use \"$extra_pip_install_flags\" to succeed. This means that a dependencies file in build/pkgs/ needs to be updated. Please report this to [email protected], including the build log of this package."
+    fi
 fi

build/pkgs/bleach/dependencies

@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+$(PYTHON) packaging six | $(PYTHON_TOOLCHAIN)
 
 ----------
 All lines of this file are ignored except the first.

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=c68b33782a9f983d5cd132cdb85b9cdc424d5c04
-md5=be4260558a6cf800a2e9eda789efc32b
-cksum=344926279
+sha1=9b22a30a08e51ba00cd1d83434baaefd3185301e
+md5=0ac843dd51c77c37da876beae77af4bf
+cksum=1637280499

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-a2af3f6a457f4c5618b72690a5c0be2b02360afb
+0a4f2a302c23d9c821b7be2cd6a7429075b7da60

build/pkgs/database_knotinfo/checksums.ini

@@ -1,5 +1,5 @@
 tarball=database_knotinfo-VERSION.tar.gz
-sha1=2d758c5f8bf346162d13bec1d5bccfec9d27baa1
-md5=ec20d43af0c4ecf59dfd281c6ccc4ef0
-cksum=2792610748
+sha1=549e3162b2ba6942dede30366072d10e26643f54
+md5=c6487321cd2e0fd6b9f9ee7bdfa19993
+cksum=2255768788
 upstream_url=https://pypi.io/packages/source/d/database_knotinfo/database_knotinfo-VERSION.tar.gz

build/pkgs/database_knotinfo/dependencies

@@ -1,4 +1,4 @@
-$(PYTHON) | $(PYTHON_TOOLCHAIN)
+$(PYTHON) | $(PYTHON_TOOLCHAIN) $(and $(filter-out no,$(SAGE_CHECK_database_knotinfo)), $(SAGERUNTIME) ipywidgets sympy singular gap libhomfly libbraiding matplotlib)
 
 ----------
 All lines of this file are ignored except the first.