Merge branches 'ci_fix_multistage', 'openblas_0_3_24' and 'pplpy-0.8.…

…8' into 10.2.beta5+updates
mkoeppe · Sep 28, 2023 · ed48864 · ed48864
4 parents 8b1facb + ee55b52 + 3f8968e + 525dedd
commit ed48864
Show file tree

Hide file tree

Showing 14 changed files with 38 additions and 66 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -192,7 +192,7 @@ jobs:
               echo "DOCKER_CONFIG_FILE=$HOME/.docker/config.json" >> $GITHUB_ENV
             fi
             # This line needs to be run before the step "Merge CI fixes from sagemath/sage".
-            DOCKER_TAG="$(git describe --dirty --always)
+            DOCKER_TAG="$(git describe --dirty --always)"
             echo "DOCKER_TAG=$DOCKER_TAG" >> $GITHUB_ENV
             # From the docker documentation via .ci/update-env.sh:
             # "A tag name must be valid ASCII and may

diff --git a/.github/workflows/scan-logs.sh b/.github/workflows/scan-logs.sh
@@ -5,9 +5,13 @@ LOGS=${1-logs}
 for a in $(find "$LOGS" -type f -name "*.log"); do
     if tail -100 "$a" 2>/dev/null | grep "^[A-Za-z]*Error" >/dev/null; then
         echo :":"error file=$a:":" ==== ERROR IN LOG FILE $a ====
+        echo "::group::$a"
         cat "$a"
+        echo "::endgroup::"
     elif tail -20 "$a" 2>/dev/null | grep -E "^(Warning: Error testing|^sage .*doctest.*failed)" >/dev/null; then
         echo :":"warning file=$a:":" ==== TESTSUITE FAILURE IN LOG FILE $a ====
+        echo "::group::$a"
         cat "$a"
+        echo "::endgroup::"
     fi
 done
diff --git a/build/bin/write-dockerfile.sh b/build/bin/write-dockerfile.sh
@@ -230,11 +230,11 @@ ARG EXTRA_CONFIGURE_ARGS=""
 EOF
 if [ ${WITH_SYSTEM_SPKG} = "force" ]; then
     cat <<EOF
-$RUN echo "****** Configuring: ./configure --enable-build-as-root $CONFIGURE_ARGS \${EXTRA_CONFIGURE_ARGS} *******"; ./configure --enable-build-as-root $CONFIGURE_ARGS \${EXTRA_CONFIGURE_ARGS} || (echo "********** configuring without forcing ***********"; cat config.log; ./configure --enable-build-as-root; cat config.log; exit 1) $ENDRUN
+$RUN echo "****** Configuring: ./configure --enable-build-as-root $CONFIGURE_ARGS \${EXTRA_CONFIGURE_ARGS} *******"; ./configure --enable-build-as-root $CONFIGURE_ARGS \${EXTRA_CONFIGURE_ARGS} || (echo "********** configuring without forcing ***********"; echo "::group::config.log"; cat config.log; echo "::endgroup::"; ./configure --enable-build-as-root; echo "::group::config.log"; cat config.log; echo "::endgroup::"; exit 1) $ENDRUN
 EOF
 else
     cat <<EOF
-$RUN echo "****** Configuring: ./configure --enable-build-as-root $CONFIGURE_ARGS \${EXTRA_CONFIGURE_ARGS} *******"; ./configure --enable-build-as-root $CONFIGURE_ARGS \${EXTRA_CONFIGURE_ARGS} || (cat config.log; exit 1) $ENDRUN
+$RUN echo "****** Configuring: ./configure --enable-build-as-root $CONFIGURE_ARGS \${EXTRA_CONFIGURE_ARGS} *******"; ./configure --enable-build-as-root $CONFIGURE_ARGS \${EXTRA_CONFIGURE_ARGS} || (echo "::group::config.log"; cat config.log; echo "::endgroup::"; exit 1) $ENDRUN
 EOF
 fi
 cat <<EOF

diff --git a/build/pkgs/_python3.10/distros/fedora.txt b/build/pkgs/_python3.10/distros/fedora.txt
@@ -1,2 +1,2 @@
-python310
-python310-devel
+python3.10
+python3.10-devel
diff --git a/build/pkgs/_python3.11/distros/fedora.txt b/build/pkgs/_python3.11/distros/fedora.txt
@@ -1,2 +1,2 @@
-python311
-python311-devel
+python3.11
+python3.11-devel
diff --git a/build/pkgs/_python3.12/distros/fedora.txt b/build/pkgs/_python3.12/distros/fedora.txt
@@ -1,2 +1,2 @@
-python312
-python312-devel
+python3.12
+python3.12-devel
diff --git a/build/pkgs/_python3.9/distros/fedora.txt b/build/pkgs/_python3.9/distros/fedora.txt
@@ -1,2 +1,3 @@
-python39
-python39-devel
+python3.9
+python3.9-devel
+# Except on centos-stream-8, where it is called python39 and python3.9-devel; we special-case this in tox.ini
diff --git a/build/pkgs/openblas/checksums.ini b/build/pkgs/openblas/checksums.ini
@@ -1,5 +1,5 @@
 tarball=openblas-VERSION.tar.gz
-sha1=6b781727c7b95850ae4a3eb0a391492eb4f3e780
-md5=115634b39007de71eb7e75cf7591dfb2
-cksum=2485407229
+sha1=86dbb39e6fe0a7fa64e7ba0922f08c6250916a27
+md5=23599a30e4ce887590957d94896789c8
+cksum=2695180405
 upstream_url=https://github.com/xianyi/OpenBLAS/archive/vVERSION.tar.gz
diff --git a/build/pkgs/openblas/package-version.txt b/build/pkgs/openblas/package-version.txt
@@ -1 +1 @@
-0.3.23
+0.3.24
diff --git a/build/pkgs/pplpy/checksums.ini b/build/pkgs/pplpy/checksums.ini
@@ -1,5 +1,5 @@
 tarball=pplpy-VERSION.tar.gz
-sha1=9f0d531d77dab19f1f0f350022687a8bd749aee2
-md5=980223c38fc95b2f4f8265f20b45a98e
-cksum=3147352163
+sha1=dc9e8a7a867ee1c066bdbecf22b6a59dc2052711
+md5=220fc7ab95d7bd62d40acb276f9b149f
+cksum=2156962833
 upstream_url=https://pypi.io/packages/source/p/pplpy/pplpy-VERSION.tar.gz
diff --git a/build/pkgs/pplpy/package-version.txt b/build/pkgs/pplpy/package-version.txt
@@ -1 +1 @@
-0.8.7
+0.8.9
diff --git a/build/pkgs/pplpy/patches/cython3-legacy.patch b/build/pkgs/pplpy/patches/cython3-legacy.patch
diff --git a/build/pkgs/pplpy/patches/relative-import.patch b/build/pkgs/pplpy/patches/relative-import.patch
diff --git a/tox.ini b/tox.ini
@@ -529,7 +529,11 @@ setenv =
     #  - python
     #
     # Setting "--with-system-python3=yes" explicitly in case we change the configure default
-    # to "--with-system-python3=force" as originally proposed in #32060
+    # to "--with-system-python3=force" as originally proposed in #32060.
+    #
+    # For all factors that set "--with-system-python3=force",
+    # we add "_bootstrap liblzma bzip2 libffi libpng zlib" to EXTRA_SAGE_PACKAGES_5
+    # so that the configured python3 can be accepted by configure.
                                                                  PYTHON_MAJOR=3
                                                                    PYTHON_MINOR=10
     python3.9:                                                     PYTHON_MINOR=9
@@ -540,16 +544,22 @@ setenv =
     python3_spkg:                                                    CONFIG_CONFIGURE_ARGS_1=--without-system-python3
     python3.9,python3.10,python3.11,python3.12:                      CONFIG_CONFIGURE_ARGS_1=--with-system-python3=force --with-python=python{env:PYTHON_MAJOR}.{env:PYTHON_MINOR}
     python3.9,python3.10,python3.11,python3.12:                        EXTRA_SAGE_PACKAGES_5=_python{env:PYTHON_MAJOR}.{env:PYTHON_MINOR} _bootstrap liblzma bzip2 libffi libpng zlib
+    # As of 2023-9, Xcode 15.0.0, this is Python 3.9.6.
     macos-python3_xcode:                                             CONFIG_CONFIGURE_ARGS_1=--with-system-python3=force --with-python=/usr/bin/python3
-    macos-{python3_xcode,nohomebrew}-{python3.8}:                    CONFIG_CONFIGURE_ARGS_1=--with-system-python3=force --with-python=/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/{env:PYTHON_MAJOR}.{env:PYTHON_MINOR}/bin/python3
+    macos-python3_xcode:                                               EXTRA_SAGE_PACKAGES_5=_bootstrap liblzma bzip2 libffi libpng zlib
+    macos-{python3_xcode,nohomebrew}-{python3.9}:                    CONFIG_CONFIGURE_ARGS_1=--with-system-python3=force --with-python=/Library/Developer/CommandLineTools/Library/Frameworks/Python3.framework/Versions/{env:PYTHON_MAJOR}.{env:PYTHON_MINOR}/bin/python3
     # Homebrew keg installs
-    homebrew-{python3.9,python3.10,python3.11,python3.12}: CONFIG_CONFIGURE_ARGS_1=--with-system-python3=force --with-python={env:HOMEBREW}/opt/python@{env:PYTHON_MAJOR}.{env:PYTHON_MINOR}/bin/python3
+    homebrew-{python3.9,python3.10,python3.11,python3.12}:           CONFIG_CONFIGURE_ARGS_1=--with-system-python3=force --with-python={env:HOMEBREW}/opt/python@{env:PYTHON_MAJOR}.{env:PYTHON_MINOR}/bin/python3
     # Installers from https://www.python.org/downloads/macos/ (must manually download and install)
     macos-python3_pythonorg:                                         CONFIG_CONFIGURE_ARGS_1=--with-system-python3=force --with-python=/Library/Frameworks/Python.framework/Versions/{env:PYTHON_MAJOR}.{env:PYTHON_MINOR}/bin/python3
+    macos-python3_pythonorg:                                           EXTRA_SAGE_PACKAGES_5=_bootstrap liblzma bzip2 libffi libpng zlib
     # https://github.com/pypa/manylinux
     manylinux-standard:                                              CONFIG_CONFIGURE_ARGS_1=--with-system-python3=force --with-python=/opt/python/cp{env:PYTHON_MAJOR}{env:PYTHON_MINOR}-cp{env:PYTHON_MAJOR}{env:PYTHON_MINOR}/bin/python3
     manylinux-{python3.9,python3.10,python3.11,python3.12}:            EXTRA_SAGE_PACKAGES_5=_bootstrap liblzma bzip2 libffi libpng
     conda:                                                           CONFIG_CONFIGURE_ARGS_1=--with-system-python3=force --with-python=python3
+    conda:                                                             EXTRA_SAGE_PACKAGES_5=_bootstrap liblzma bzip2 libffi libpng zlib
+
+    centos-stream-8-python3.9:                                           EXTRA_SYSTEM_PACKAGES=python39 python39-devel
     #
     #  - toolchain
     #
@@ -700,7 +710,7 @@ commands =
     docker:        bash -c 'for docker_target in {env:DOCKER_TARGETS:with-targets}; do \
     docker:            BUILD_IMAGE_STEM=sage-$(echo {envname} | sed "s/docker-//;s/-incremental//"); \
     docker:            BUILD_IMAGE=$DOCKER_PUSH_REPOSITORY$BUILD_IMAGE_STEM-$docker_target; \
-    docker:            BUILD_TAG=$(git describe --dirty --always); \
+    docker:            BUILD_TAG={env:DOCKER_TAG:$(git describe --dirty --always)}; \
     docker:            TAG_ARGS=$(for tag in $BUILD_TAG {env:EXTRA_DOCKER_TAGS:}; do echo --tag $BUILD_IMAGE:$tag; done); \
     docker:            DOCKER_BUILDKIT={env:DOCKER_BUILDKIT:0} \
     docker:            docker build . -f {envdir}/Dockerfile \