From 2d27dd6fdbed9c6ad792ca94424255b992cda2bb Mon Sep 17 00:00:00 2001 From: Vincent Delecroix Date: Sun, 3 Sep 2023 23:06:45 +0200 Subject: [PATCH 1/9] Upgrade pplpy to 0.8.9 --- build/pkgs/pplpy/checksums.ini | 6 +++--- build/pkgs/pplpy/package-version.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/pkgs/pplpy/checksums.ini b/build/pkgs/pplpy/checksums.ini index 22961af9a1f..73f16fc3f00 100644 --- 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 index 1e9b46b2298..55485e17937 100644 --- a/build/pkgs/pplpy/package-version.txt +++ b/build/pkgs/pplpy/package-version.txt @@ -1 +1 @@ -0.8.7 +0.8.9 From c22728a5c97a509997e319099b15adacaee7bfb8 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Wed, 27 Sep 2023 16:25:08 -0700 Subject: [PATCH 2/9] build/pkgs/pplpy/patches/cython3-legacy.patch: Remove --- build/pkgs/pplpy/patches/cython3-legacy.patch | 22 ------------------- 1 file changed, 22 deletions(-) delete mode 100644 build/pkgs/pplpy/patches/cython3-legacy.patch diff --git a/build/pkgs/pplpy/patches/cython3-legacy.patch b/build/pkgs/pplpy/patches/cython3-legacy.patch deleted file mode 100644 index a038da16d6b..00000000000 --- a/build/pkgs/pplpy/patches/cython3-legacy.patch +++ /dev/null @@ -1,22 +0,0 @@ -commit e6f3e66154138ce3e31e803e74b8c71787c70acc -Author: Gonzalo Tornaría -Date: Wed Jul 19 20:47:52 2023 -0300 - - cython3 support using legacy directives - -diff --git a/setup.py b/setup.py -index 13d543b..55dcd34 100755 ---- a/setup.py -+++ b/setup.py -@@ -38,7 +38,11 @@ class build_ext(_build_ext): - self.extensions[:] = cythonize( - self.extensions, - include_path=sys.path, -- compiler_directives={'embedsignature': True}) -+ compiler_directives={ -+ 'embedsignature': True, -+ 'legacy_implicit_noexcept': True, -+ 'c_api_binop_methods': True, -+ }) - - _build_ext.run(self) From 525dedd68f8b995aade17d3644a48578e5e29413 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Wed, 27 Sep 2023 16:33:24 -0700 Subject: [PATCH 3/9] build/pkgs/pplpy/patches/relative-import.patch: Remove --- .../pkgs/pplpy/patches/relative-import.patch | 21 ------------------- 1 file changed, 21 deletions(-) delete mode 100644 build/pkgs/pplpy/patches/relative-import.patch diff --git a/build/pkgs/pplpy/patches/relative-import.patch b/build/pkgs/pplpy/patches/relative-import.patch deleted file mode 100644 index 3c011203367..00000000000 --- a/build/pkgs/pplpy/patches/relative-import.patch +++ /dev/null @@ -1,21 +0,0 @@ -From aaa28537fa7ea061ebb8d5131b1e23673eaf741d Mon Sep 17 00:00:00 2001 -From: Matthias Koeppe -Date: Sun, 31 Jul 2022 12:39:34 -0700 -Subject: [PATCH] ppl/bit_arrays.pxd: Use relative cimport - ---- - ppl/bit_arrays.pxd | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/ppl/bit_arrays.pxd b/ppl/bit_arrays.pxd -index eb57434..145a978 100644 ---- a/ppl/bit_arrays.pxd -+++ b/ppl/bit_arrays.pxd -@@ -1,4 +1,4 @@ --from ppl_decl cimport * -+from .ppl_decl cimport * - - cdef class Bit_Row(object): - cdef PPL_Bit_Row *thisptr --- -GitLab From e50e42882d0081488c3119f3b9d7d4496926f762 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Thu, 28 Sep 2023 10:38:25 -0700 Subject: [PATCH 4/9] Fixup --- .github/workflows/docker.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml index 59319dc22be..d49aa516356 100644 --- 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 From e6b80619ab6533163f0bbc217788b5976b460626 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Thu, 28 Sep 2023 11:24:14 -0700 Subject: [PATCH 5/9] tox.ini: Fixup --- tox.ini | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tox.ini b/tox.ini index bb9296f6ce0..28a5fee6d46 100644 --- a/tox.ini +++ b/tox.ini @@ -700,7 +700,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 \ From e43129a8b89e14facf850a7596ae49bd8cb79767 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Thu, 28 Sep 2023 11:50:57 -0700 Subject: [PATCH 6/9] tox.ini: When setting --with-system-python3=force, always provision the python3 depcheck dependencies --- tox.ini | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/tox.ini b/tox.ini index 28a5fee6d46..75ffeed48c3 100644 --- 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,20 @@ 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 # # - toolchain # From e5c8f214cb9e7cbec761c84674879b03235d328b Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Thu, 28 Sep 2023 12:23:36 -0700 Subject: [PATCH 7/9] build/pkgs/_python3.*/distros/fedora.txt: Packages now include a dot - except on centos-stream-8 --- build/pkgs/_python3.10/distros/fedora.txt | 4 ++-- build/pkgs/_python3.11/distros/fedora.txt | 4 ++-- build/pkgs/_python3.12/distros/fedora.txt | 4 ++-- build/pkgs/_python3.9/distros/fedora.txt | 5 +++-- tox.ini | 2 ++ 5 files changed, 11 insertions(+), 8 deletions(-) diff --git a/build/pkgs/_python3.10/distros/fedora.txt b/build/pkgs/_python3.10/distros/fedora.txt index 90e42c91602..02cc9cf73d1 100644 --- 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 index a478404f8fb..7fe5c300aed 100644 --- 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 index b7ad10be81b..c3e29a02d27 100644 --- 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 index 046ffc713b3..c537660392d 100644 --- 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/tox.ini b/tox.ini index 75ffeed48c3..81ca5da421b 100644 --- a/tox.ini +++ b/tox.ini @@ -558,6 +558,8 @@ setenv = 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 # From ee55b52a6d0a381a93d6b6dce1ef908c95014cae Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Thu, 28 Sep 2023 13:56:52 -0700 Subject: [PATCH 8/9] build/bin/write-dockerfile.sh, .github/workflows/scan-logs.sh: Use more GH Actions output groups --- .github/workflows/scan-logs.sh | 4 ++++ build/bin/write-dockerfile.sh | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/.github/workflows/scan-logs.sh b/.github/workflows/scan-logs.sh index 9cab637e850..5df32b0fc48 100755 --- 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 index 6980f6b6e4b..1d0508fe9b3 100755 --- 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 < Date: Thu, 28 Sep 2023 13:59:56 -0700 Subject: [PATCH 9/9] build/pkgs/openblas: Update to 0.3.24 --- build/pkgs/openblas/checksums.ini | 6 +++--- build/pkgs/openblas/package-version.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/pkgs/openblas/checksums.ini b/build/pkgs/openblas/checksums.ini index c2a1fe997c5..3511f8f2fc0 100644 --- 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 index a1dad2aa79c..cfe389e9458 100644 --- a/build/pkgs/openblas/package-version.txt +++ b/build/pkgs/openblas/package-version.txt @@ -1 +1 @@ -0.3.23 +0.3.24