From 84d046ab95e1b73b5aefdaf737a0d704be3ba8f2 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 23 Sep 2023 09:09:39 -0700 Subject: [PATCH 01/10] build/pkgs/matplotlib: Update to 3.8.0 --- build/pkgs/matplotlib/checksums.ini | 6 +++--- build/pkgs/matplotlib/package-version.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/pkgs/matplotlib/checksums.ini b/build/pkgs/matplotlib/checksums.ini index cbf7302ffb1..6be6d882f3b 100644 --- a/build/pkgs/matplotlib/checksums.ini +++ b/build/pkgs/matplotlib/checksums.ini @@ -1,5 +1,5 @@ tarball=matplotlib-VERSION.tar.gz -sha1=2b78c671f95d52c65154a0dc68372a97582768e5 -md5=77ca9a5b42152c9e2aeca1556f08f5ce -cksum=3201608 +sha1=b3391b48ab0bf91778064ce5b2226ff2a2658d7c +md5=2c70bea4dea84c090a7ecc8e0bb0748f +cksum=1228885956 upstream_url=https://pypi.io/packages/source/m/matplotlib/matplotlib-VERSION.tar.gz diff --git a/build/pkgs/matplotlib/package-version.txt b/build/pkgs/matplotlib/package-version.txt index b72762837ea..19811903a7f 100644 --- a/build/pkgs/matplotlib/package-version.txt +++ b/build/pkgs/matplotlib/package-version.txt @@ -1 +1 @@ -3.6.2 +3.8.0 From 8cec8bfb63f0940f38db5de100028f221852d2f1 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 23 Sep 2023 09:10:14 -0700 Subject: [PATCH 02/10] build/pkgs/pillow: Update to 10.0.1 --- build/pkgs/pillow/checksums.ini | 6 +++--- build/pkgs/pillow/package-version.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/pkgs/pillow/checksums.ini b/build/pkgs/pillow/checksums.ini index 842c4ce3c05..afa97cc028f 100644 --- a/build/pkgs/pillow/checksums.ini +++ b/build/pkgs/pillow/checksums.ini @@ -1,5 +1,5 @@ tarball=Pillow-VERSION.tar.gz -sha1=64243cccc992e4ab60641045775fba65c1cf032b -md5=8deffccb4f402df154fd2fd504d8487c -cksum=2485281093 +sha1=47c1f2179bc7de5e3413feed08f7a859854030c3 +md5=93a0585ab0ee9717a7576129bdabdf93 +cksum=3176045361 upstream_url=https://pypi.io/packages/source/p/pillow/Pillow-VERSION.tar.gz diff --git a/build/pkgs/pillow/package-version.txt b/build/pkgs/pillow/package-version.txt index 37ad5c8b19d..1532420512a 100644 --- a/build/pkgs/pillow/package-version.txt +++ b/build/pkgs/pillow/package-version.txt @@ -1 +1 @@ -9.0.1 +10.0.1 From b966e6419e3bd7bc42e5543c3c182329724e5f7d Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 23 Sep 2023 09:10:27 -0700 Subject: [PATCH 03/10] build/pkgs/contourpy: Update to 1.1.1 --- build/pkgs/contourpy/checksums.ini | 6 +++--- build/pkgs/contourpy/package-version.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/pkgs/contourpy/checksums.ini b/build/pkgs/contourpy/checksums.ini index 2b346a32ccc..f4751b4da06 100644 --- a/build/pkgs/contourpy/checksums.ini +++ b/build/pkgs/contourpy/checksums.ini @@ -1,5 +1,5 @@ tarball=contourpy-VERSION.tar.gz -sha1=f8dac7a79be96e2b8f085f79ba386dba54e99e99 -md5=0ed85863802b1323708b400ae7e7bbd7 -cksum=2680473500 +sha1=eb8520cb7172aa8b957d8ba2d09e8f6d9a068d2a +md5=dd89f11007f39baec1e858ad1f464ea9 +cksum=239770832 upstream_url=https://pypi.io/packages/source/c/contourpy/contourpy-VERSION.tar.gz diff --git a/build/pkgs/contourpy/package-version.txt b/build/pkgs/contourpy/package-version.txt index af0b7ddbffd..524cb55242b 100644 --- a/build/pkgs/contourpy/package-version.txt +++ b/build/pkgs/contourpy/package-version.txt @@ -1 +1 @@ -1.0.6 +1.1.1 From 40ed03b6729520cb81250277e1113158018ced40 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 23 Sep 2023 09:10:35 -0700 Subject: [PATCH 04/10] build/pkgs/fonttools: Update to 4.42.1 --- build/pkgs/fonttools/checksums.ini | 6 +++--- build/pkgs/fonttools/package-version.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/pkgs/fonttools/checksums.ini b/build/pkgs/fonttools/checksums.ini index 1a0ba1454cf..7f0244a5c1a 100644 --- a/build/pkgs/fonttools/checksums.ini +++ b/build/pkgs/fonttools/checksums.ini @@ -1,5 +1,5 @@ tarball=fonttools-VERSION.zip -sha1=8d6f8120ad4b3d00dd92cfea3a2e0b4ae1d72bc7 -md5=c1605575dcc45ef35455ae1d606868b3 -cksum=3346598630 +sha1=5432f0273040b044e8d6465947e3a4c00097bdbf +md5=039956b85e9b84ba53373b0df644f5ad +cksum=3441365368 upstream_url=https://pypi.io/packages/source/f/fonttools/fonttools-VERSION.zip diff --git a/build/pkgs/fonttools/package-version.txt b/build/pkgs/fonttools/package-version.txt index 1f30b28189e..32855ddb789 100644 --- a/build/pkgs/fonttools/package-version.txt +++ b/build/pkgs/fonttools/package-version.txt @@ -1 +1 @@ -4.28.4 +4.42.1 From 81b21bccf4cda5ca8e3ce8a794aa98e9d8598f58 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 23 Sep 2023 09:10:55 -0700 Subject: [PATCH 05/10] build/pkgs/pyparsing: Update to 3.1.1 --- build/pkgs/pyparsing/checksums.ini | 6 +++--- build/pkgs/pyparsing/package-version.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/pkgs/pyparsing/checksums.ini b/build/pkgs/pyparsing/checksums.ini index c002d3a3e65..1c6d7b9b36b 100644 --- a/build/pkgs/pyparsing/checksums.ini +++ b/build/pkgs/pyparsing/checksums.ini @@ -1,5 +1,5 @@ tarball=pyparsing-VERSION.tar.gz -sha1=13f44b5b186a627f2481a8eb0d7aedcd6885a641 -md5=fadc2f3bf5872bf6310576a86c3566e0 -cksum=741417334 +sha1=2e9cf056c36c132f15476dfdd50449d48b48f6a2 +md5=bb8c8c6b8015ca5887ae2c37917ee82e +cksum=513345755 upstream_url=https://files.pythonhosted.org/packages/source/p/pyparsing/pyparsing-VERSION.tar.gz diff --git a/build/pkgs/pyparsing/package-version.txt b/build/pkgs/pyparsing/package-version.txt index 747457c6d22..94ff29cc4de 100644 --- a/build/pkgs/pyparsing/package-version.txt +++ b/build/pkgs/pyparsing/package-version.txt @@ -1 +1 @@ -3.0.9 +3.1.1 From 4066e0f73793e798449e65970b71c77d6c94215c Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 23 Sep 2023 09:11:07 -0700 Subject: [PATCH 06/10] build/pkgs/kiwisolver: Update to 1.4.5 --- build/pkgs/kiwisolver/checksums.ini | 6 +++--- build/pkgs/kiwisolver/package-version.txt | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/build/pkgs/kiwisolver/checksums.ini b/build/pkgs/kiwisolver/checksums.ini index 3fc15248198..db7ec7448ef 100644 --- a/build/pkgs/kiwisolver/checksums.ini +++ b/build/pkgs/kiwisolver/checksums.ini @@ -1,5 +1,5 @@ tarball=kiwisolver-VERSION.tar.gz -sha1=157556602639eb6cc8546463f56feaa9023e3bcd -md5=73a4e57c33ded99dbe9a5cabca5be04b -cksum=3382585353 +sha1=e5234bdcb7e7b620d47a00da076d50f2b63d8649 +md5=20dea6992699d6be8a563995d7fe0309 +cksum=1731645516 upstream_url=https://files.pythonhosted.org/packages/source/k/kiwisolver/kiwisolver-VERSION.tar.gz diff --git a/build/pkgs/kiwisolver/package-version.txt b/build/pkgs/kiwisolver/package-version.txt index 428b770e3e2..e516bb9d963 100644 --- a/build/pkgs/kiwisolver/package-version.txt +++ b/build/pkgs/kiwisolver/package-version.txt @@ -1 +1 @@ -1.4.3 +1.4.5 From b5f3c9eb15a5ff5d07a8dc5070494fa5fcf2c599 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 23 Sep 2023 09:23:44 -0700 Subject: [PATCH 07/10] build/pkgs/contourpy: Update for meson build system --- build/pkgs/contourpy/dependencies | 2 +- build/pkgs/contourpy/spkg-install.in | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/build/pkgs/contourpy/dependencies b/build/pkgs/contourpy/dependencies index d12b50bf33c..b4f14ae3ca8 100644 --- a/build/pkgs/contourpy/dependencies +++ b/build/pkgs/contourpy/dependencies @@ -1,4 +1,4 @@ - numpy | $(PYTHON_TOOLCHAIN) pybind11 $(PYTHON) + numpy | $(PYTHON_TOOLCHAIN) pybind11 meson_python $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/contourpy/spkg-install.in b/build/pkgs/contourpy/spkg-install.in index 37ac1a53437..70b19a5b415 100644 --- a/build/pkgs/contourpy/spkg-install.in +++ b/build/pkgs/contourpy/spkg-install.in @@ -1,2 +1,6 @@ +# https://github.com/scipy/scipy/issues/16536 - meson breaks when CXX="g++ -std=gnu++11" +export CXX=$(echo "$CXX" | sed 's/-std=[a-z0-9+]*//g') + cd src -sdh_pip_install . +# --no-build-isolation because it has build dep on 'meson', which we don't have as a Python package +sdh_pip_install --no-build-isolation . From c32c24b22fa722133d64baf23de61daf738b813a Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 23 Sep 2023 12:41:44 -0700 Subject: [PATCH 08/10] build/pkgs/fonttools/checksums.ini: Fix up --- build/pkgs/fonttools/checksums.ini | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/pkgs/fonttools/checksums.ini b/build/pkgs/fonttools/checksums.ini index 7f0244a5c1a..b0aa6d12927 100644 --- a/build/pkgs/fonttools/checksums.ini +++ b/build/pkgs/fonttools/checksums.ini @@ -1,5 +1,5 @@ -tarball=fonttools-VERSION.zip +tarball=fonttools-VERSION.tar.gz sha1=5432f0273040b044e8d6465947e3a4c00097bdbf md5=039956b85e9b84ba53373b0df644f5ad cksum=3441365368 -upstream_url=https://pypi.io/packages/source/f/fonttools/fonttools-VERSION.zip +upstream_url=https://pypi.io/packages/source/f/fonttools/fonttools-VERSION.tar.gz From 70b2d0b0f83b6d6751b25bd2f42c3d83a65f0d3a Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Fri, 29 Sep 2023 20:49:18 -0700 Subject: [PATCH 09/10] build/bin/sage-dist-helpers (sdh_pip_install): Handle --config-settings --- build/bin/sage-dist-helpers | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/build/bin/sage-dist-helpers b/build/bin/sage-dist-helpers index 67a2201d31f..6f330deed22 100644 --- a/build/bin/sage-dist-helpers +++ b/build/bin/sage-dist-helpers @@ -242,6 +242,7 @@ sdh_pip_install() { mkdir -p dist rm -f dist/*.whl install_options="" + build_options="" # pip has --no-build-isolation but no flag that turns the default back on... build_isolation_option="--find-links=$SAGE_SPKG_WHEELS" while [ $# -gt 0 ]; do @@ -260,13 +261,18 @@ sdh_pip_install() { --no-deps) install_options="$install_options $1" ;; + -C|--config-settings) + build_options="$build_options $1" + shift + build_options="$build_options $1" + ;; *) break ;; esac shift done - if python3 -m pip wheel --wheel-dir=dist --verbose --no-deps --no-index --isolated --ignore-requires-python $build_isolation_option "$@"; then + if python3 -m pip wheel --wheel-dir=dist --verbose --no-deps --no-index --isolated --ignore-requires-python $build_isolation_option $build_options "$@"; then : # successful else case $build_isolation_option in @@ -277,7 +283,7 @@ sdh_pip_install() { echo >&2 "Warning: building with \"python3 -m pip wheel --wheel-dir=dist --verbose --no-deps --no-index --isolated --ignore-requires-python $build_isolation_option\" failed." build_isolation_option="--no-build-isolation --no-binary :all:" echo >&2 "Retrying with \"python3 -m pip wheel --wheel-dir=dist --verbose --no-deps --no-index --isolated --ignore-requires-python $build_isolation_option\"." - if python3 -m pip wheel --wheel-dir=dist --verbose --no-deps --no-index --isolated --ignore-requires-python $build_isolation_option "$@"; then + if python3 -m pip wheel --wheel-dir=dist --verbose --no-deps --no-index --isolated --ignore-requires-python $build_isolation_option $build_options "$@"; then echo >&2 "Warning: Wheel building needed to use \"$build_isolation_option\" to succeed. This means that a dependencies file in build/pkgs/ needs to be updated. Please report this to sage-devel@googlegroups.com, including the build log of this package." else sdh_die "Error building a wheel for $PKG_NAME" From 00f6b00309a4c06ef12b4a998a8397e09a9f2751 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Fri, 29 Sep 2023 20:49:51 -0700 Subject: [PATCH 10/10] build/pkgs/pillow/spkg-install.in: Update to new config format --- build/pkgs/pillow/spkg-install.in | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/build/pkgs/pillow/spkg-install.in b/build/pkgs/pillow/spkg-install.in index dade6b99a5c..e76b30f7383 100644 --- a/build/pkgs/pillow/spkg-install.in +++ b/build/pkgs/pillow/spkg-install.in @@ -1,20 +1,11 @@ cd src -# Delete old version -rm -rf \ - "$SAGE_LOCAL"/lib/python*/site-packages/PIL \ - "$SAGE_LOCAL"/lib/python*/site-packages/PIL-*.egg* \ - "$SAGE_LOCAL"/lib/python*/site-packages/Pillow-*.egg* - if [ "$CONDA_PREFIX" != "" ]; then # Quoted quotes so that whitespace in CONDA_PREFIX works correctly. # Below we run the command line through eval. - PILLOW_BUILD_EXT="$PILLOW_BUILD_EXT --disable-platform-guessing -I\"$CONDA_PREFIX/include\" -L\"$CONDA_PREFIX/lib\"" + PILLOW_CONFIG_SETTINGS="$PILLOW_CONFIG_SETTINGS -C platform-guessing=disable" fi -PILLOW_BUILD_EXT="--debug --disable-jpeg $PILLOW_BUILD_EXT" +PILLOW_CONFIG_SETTINGS="-C debug=true -C jpeg=disable $PILLOW_CONFIG_SETTINGS" -# Note: Avoid shared libraries inside egg files, Trac #19467 -eval sdh_pip_install \ - $(eval sdh_prefix_args "--build-option" build_ext $PILLOW_BUILD_EXT) \ - . +eval sdh_pip_install $PILLOW_CONFIG_SETTINGS .