Merge #32733

Author: Matthias Koeppe

.homebrew-build-env

@@ -2,7 +2,7 @@
 # that activate keg-only homebrew package installations
 
 HOMEBREW=`brew --prefix` || return 1
-for l in gettext bzip2 texinfo; do
+for l in gettext bzip2 texinfo polymake; do
     if [ -d "$HOMEBREW/opt/$l/bin" ]; then
         PATH="$HOMEBREW/opt/$l/bin:$PATH"
     fi
@@ -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 ntl; do
+for l in readline bzip2 ntl polymake; 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.5.beta5", 
-    "version": "9.5.beta5", 
+    "title": "sagemath/sage: 9.5.beta6", 
+    "version": "9.5.beta6", 
     "upload_type": "software", 
-    "publication_date": "2021-10-28", 
+    "publication_date": "2021-11-12", 
     "creators": [
         {
             "affiliation": "SageMath.org", 
@@ -15,7 +15,7 @@
     "related_identifiers": [
         {
             "scheme": "url", 
-            "identifier": "https://github.com/sagemath/sage/tree/9.5.beta5", 
+            "identifier": "https://github.com/sagemath/sage/tree/9.5.beta6", 
             "relation": "isSupplementTo"
         }, 
         {

VERSION.txt

@@ -1 +1 @@
-SageMath version 9.5.beta5, Release Date: 2021-10-28
+SageMath version 9.5.beta6, Release Date: 2021-11-12

build/bin/sage-dist-helpers

@@ -56,11 +56,12 @@
 #    be given as arguments.  If $SAGE_DESTDIR is not set then the command is
 #    run with $SAGE_SUDO, if set.
 #
-# - sdh_pip_install [...]
+# - sdh_pip_install [--no-deps] [--build-isolation] [...]
 #
-#    Runs `pip install` with the given arguments, as well as additional
-#    default arguments used for installing packages into Sage with pip.
-#    Currently this is just a wrapper around the `sage-pip-install` command.
+#    Builds a wheel using `pip wheel` with the given options [...], then installs
+#    the wheel.  Unless the special option --build-isolation is given,
+#    the wheel is built using the option --no-build-isolation.
+#    If the special option --no-deps is given, it is passed to pip install.
 #    If $SAGE_DESTDIR is not set then the command is run with $SAGE_SUDO, if
 #    set.
 #
@@ -240,10 +241,31 @@ 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 --ignore-requires-python "$@" || \
+    install_options=""
+    # pip has --no-build-isolation but no flag that turns the default back on...
+    build_isolation_option="--no-build-isolation --no-binary :all:"
+    while [ $# -gt 0 ]; do
+        case "$1" in
+            --build-isolation)
+                # If a package requests build isolation, we allow it to provision
+                # its build environment using the stored wheels.
+                # We pass --find-links and remove the --no-binary option.
+                # The SPKG needs to declare "setuptools_wheel" as a dependency.
+                build_isolation_option="--find-links=$SAGE_SPKG_WHEELS"
+                ;;
+            --no-deps)
+                install_options="$install_options $1"
+                ;;
+            *)
+                break
+                ;;
+        esac
+        shift
+    done
+    python3 -m pip wheel --use-feature=in-tree-build --wheel-dir=dist --verbose --no-deps --no-index --isolated --ignore-requires-python $build_isolation_option "$@" || \
         sdh_die "Error building a wheel for $PKG_NAME"
 
-    sdh_store_and_pip_install_wheel .
+    sdh_store_and_pip_install_wheel $install_options .
 }
 
 sdh_store_wheel() {

build/bin/sage-spkg

@@ -498,15 +498,14 @@ export PKG_NAME="$PKG_NAME"
 export PKG_BASE="$PKG_BASE"
 export PKG_VER="$PKG_VER"
 
-for lib in "\$SAGE_ROOT/build/bin/sage-dist-helpers" "\$SAGE_SRC/bin/sage-env-config" "\$SAGE_SRC/bin/sage-env" "\$SAGE_ROOT/build/bin/sage-build-env-config" "\$SAGE_ROOT/build/bin/sage-build-env"; do
+for lib in "\$SAGE_ROOT/build/bin/sage-dist-helpers" "\$SAGE_SRC/bin/sage-src-env-config" "\$SAGE_SRC/bin/sage-env-config" "\$SAGE_SRC/bin/sage-env" "\$SAGE_ROOT/build/bin/sage-build-env-config" "\$SAGE_ROOT/build/bin/sage-build-env"; do
     source "\$lib"
     if [ \$? -ne 0 ]; then
         echo >&2 "Error: failed to source \$lib"
         echo >&2 "Is \$SAGE_ROOT the correct SAGE_ROOT?"
         exit 1
     fi
 done
-export PATH="$SAGE_INST_LOCAL/bin:$PATH"
 
 export SAGE_INST_LOCAL="$SAGE_INST_LOCAL"
 
@@ -773,6 +772,7 @@ if [ "$SAGE_CHECK" = "yes" -o "$SAGE_CHECK" = "warn" ]; then
         if [ $? -ne 0 ]; then
             TEST_SUITE_RESULT="failed"
             if [ "$SAGE_CHECK" = "warn" ]; then
+                # The following warning message must be consistent with SAGE_ROOT/build/make/install (see trac:32781)
                 error_msg "Warning: Failures testing package $PKG_NAME (ignored)" "make check"
             else
                 error_msg "Error testing package $PKG_NAME" "make check"

build/make/install

@@ -122,7 +122,8 @@ EOF
 
 elif [ "$SAGE_CHECK" = "warn" ]; then
     echo "SAGE_CHECK=warn, so scanning the log files. This may take a few seconds."
-    warnings=`look_for_errors "$SAGE_LOGS/*.log" 20 "^Warning: Error testing" package`
+    # The following warning message must be consistent with SAGE_ROOT/build/bin/sage-spkg (see trac:32781)
+    warnings=`look_for_errors "$SAGE_LOGS/*.log" 20 "^Warning: Failures testing package" package`
     if [ -n "$warnings" ]; then
         cat >&2 <<EOF
 ***************************************************************

build/pkgs/configure/checksums.ini

@@ -1,4 +1,4 @@
 tarball=configure-VERSION.tar.gz
-sha1=ab6592f2216c48049bbbcfb3a42c3e157f44d917
-md5=fc3a50e0f47802e55969eade44648af4
-cksum=3704729867
+sha1=bdfd5753a2548365230216455d9a543fe238f092
+md5=49ffa01e32a876dd4feea975d822351e
+cksum=3517586928

build/pkgs/configure/package-version.txt

@@ -1 +1 @@
-c5a87834e7e2939b878a5134cd240e6c712bd573
+fda367752b5e7afa3ec0fda483b162645192e008

build/pkgs/database_knotinfo/checksums.ini

@@ -1,5 +1,5 @@
 tarball=database_knotinfo-VERSION.tar.gz
-sha1=549e3162b2ba6942dede30366072d10e26643f54
-md5=c6487321cd2e0fd6b9f9ee7bdfa19993
-cksum=2255768788
+sha1=187e6b5ee2a935e3a50bc7648b181dfc7cb7bfa2
+md5=90822e09a1a84c8dbb84e20773c367f1
+cksum=1855405219
 upstream_url=https://pypi.io/packages/source/d/database_knotinfo/database_knotinfo-VERSION.tar.gz

build/pkgs/database_knotinfo/package-version.txt

@@ -1 +1 @@
-2021.9.1
+2021.10.1