Update matplotlib to 3.8.0, pillow to 10.0.1

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"

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

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.

build/pkgs/contourpy/package-version.txt

@@ -1 +1 @@
-1.0.6
+1.1.1

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 .

build/pkgs/fonttools/checksums.ini

@@ -1,5 +1,5 @@
-tarball=fonttools-VERSION.zip
-sha1=8d6f8120ad4b3d00dd92cfea3a2e0b4ae1d72bc7
-md5=c1605575dcc45ef35455ae1d606868b3
-cksum=3346598630
-upstream_url=https://pypi.io/packages/source/f/fonttools/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.tar.gz

build/pkgs/fonttools/package-version.txt

@@ -1 +1 @@
-4.28.4
+4.42.1

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

build/pkgs/kiwisolver/package-version.txt

@@ -1 +1 @@
-1.4.3
+1.4.5

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

build/pkgs/matplotlib/package-version.txt

@@ -1 +1 @@
-3.6.2
+3.8.0

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

build/pkgs/pillow/package-version.txt

@@ -1 +1 @@
-9.0.1
+10.0.1

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 .

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

build/pkgs/pyparsing/package-version.txt

@@ -1 +1 @@
-3.0.9
+3.1.1