Skip to content

Commit 50683ff

Browse files
author
Release Manager
committed
gh-36320: Update `matplotlib` to 3.8.0, `pillow` to 10.0.1 <!-- ^^^^^ Please provide a concise, informative and self-explanatory title. Don't put issue numbers in there, do this in the PR body below. For example, instead of "Fixes #1234" use "Introduce new method to calculate 1+1" --> <!-- Describe your changes here in detail --> <!-- Why is this change required? What problem does it solve? --> <!-- If this PR resolves an open issue, please link to it here. For example "Fixes #12345". --> <!-- If your change requires a documentation PR, please link it appropriately. --> ### 📝 Checklist <!-- Put an `x` in all the boxes that apply. --> <!-- If your change requires a documentation PR, please link it appropriately --> <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> <!-- Feel free to remove irrelevant items. --> - [x] The title is concise, informative, and self-explanatory. - [ ] The description explains in detail what this PR is about. - [ ] I have linked a relevant issue or discussion. - [ ] I have created tests covering the changes. - [ ] I have updated the documentation accordingly. ### ⌛ Dependencies <!-- List all open PRs that this PR logically depends on - #12345: short description why this is a dependency - #34567: ... --> - Depends on #34816 - Depends on #36279 - <!-- If you're unsure about any of these, don't hesitate to ask. We're here to help! --> URL: #36320 Reported by: Matthias Köppe Reviewer(s): John H. Palmieri, Matthias Köppe
2 parents f42202a + 4e0bf85 commit 50683ff

File tree

16 files changed

+43
-42
lines changed

16 files changed

+43
-42
lines changed

‎build/bin/sage-dist-helpers‎

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,6 +242,7 @@ sdh_pip_install() {
242242
mkdir -p dist
243243
rm -f dist/*.whl
244244
install_options=""
245+
build_options=""
245246
# pip has --no-build-isolation but no flag that turns the default back on...
246247
build_isolation_option="--find-links=$SAGE_SPKG_WHEELS"
247248
while [ $# -gt 0 ]; do
@@ -260,13 +261,18 @@ sdh_pip_install() {
260261
--no-deps)
261262
install_options="$install_options $1"
262263
;;
264+
-C|--config-settings)
265+
build_options="$build_options $1"
266+
shift
267+
build_options="$build_options $1"
268+
;;
263269
*)
264270
break
265271
;;
266272
esac
267273
shift
268274
done
269-
if python3 -m pip wheel --wheel-dir=dist --verbose --no-deps --no-index --isolated --ignore-requires-python $build_isolation_option "$@"; then
275+
if python3 -m pip wheel --wheel-dir=dist --verbose --no-deps --no-index --isolated --ignore-requires-python $build_isolation_option $build_options "$@"; then
270276
: # successful
271277
else
272278
case $build_isolation_option in
@@ -277,7 +283,7 @@ sdh_pip_install() {
277283
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."
278284
build_isolation_option="--no-build-isolation --no-binary :all:"
279285
echo >&2 "Retrying with \"python3 -m pip wheel --wheel-dir=dist --verbose --no-deps --no-index --isolated --ignore-requires-python $build_isolation_option\"."
280-
if python3 -m pip wheel --wheel-dir=dist --verbose --no-deps --no-index --isolated --ignore-requires-python $build_isolation_option "$@"; then
286+
if python3 -m pip wheel --wheel-dir=dist --verbose --no-deps --no-index --isolated --ignore-requires-python $build_isolation_option $build_options "$@"; then
281287
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 [email protected], including the build log of this package."
282288
else
283289
sdh_die "Error building a wheel for $PKG_NAME"

‎build/pkgs/contourpy/checksums.ini‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tarball=contourpy-VERSION.tar.gz
2-
sha1=f8dac7a79be96e2b8f085f79ba386dba54e99e99
3-
md5=0ed85863802b1323708b400ae7e7bbd7
4-
cksum=2680473500
2+
sha1=eb8520cb7172aa8b957d8ba2d09e8f6d9a068d2a
3+
md5=dd89f11007f39baec1e858ad1f464ea9
4+
cksum=239770832
55
upstream_url=https://pypi.io/packages/source/c/contourpy/contourpy-VERSION.tar.gz

‎build/pkgs/contourpy/dependencies‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
numpy | $(PYTHON_TOOLCHAIN) pybind11 $(PYTHON)
1+
numpy | $(PYTHON_TOOLCHAIN) pybind11 meson_python $(PYTHON)
22

33
----------
44
All lines of this file are ignored except the first.

‎build/pkgs/contourpy/package-version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.0.6
1+
1.1.1

‎build/pkgs/contourpy/spkg-install.in‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,6 @@
1+
# https://github.com/scipy/scipy/issues/16536 - meson breaks when CXX="g++ -std=gnu++11"
2+
export CXX=$(echo "$CXX" | sed 's/-std=[a-z0-9+]*//g')
3+
14
cd src
2-
sdh_pip_install .
5+
# --no-build-isolation because it has build dep on 'meson', which we don't have as a Python package
6+
sdh_pip_install --no-build-isolation .

‎build/pkgs/fonttools/checksums.ini‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
tarball=fonttools-VERSION.zip
2-
sha1=8d6f8120ad4b3d00dd92cfea3a2e0b4ae1d72bc7
3-
md5=c1605575dcc45ef35455ae1d606868b3
4-
cksum=3346598630
5-
upstream_url=https://pypi.io/packages/source/f/fonttools/fonttools-VERSION.zip
1+
tarball=fonttools-VERSION.tar.gz
2+
sha1=5432f0273040b044e8d6465947e3a4c00097bdbf
3+
md5=039956b85e9b84ba53373b0df644f5ad
4+
cksum=3441365368
5+
upstream_url=https://pypi.io/packages/source/f/fonttools/fonttools-VERSION.tar.gz

‎build/pkgs/fonttools/package-version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
4.28.4
1+
4.42.1

‎build/pkgs/kiwisolver/checksums.ini‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tarball=kiwisolver-VERSION.tar.gz
2-
sha1=157556602639eb6cc8546463f56feaa9023e3bcd
3-
md5=73a4e57c33ded99dbe9a5cabca5be04b
4-
cksum=3382585353
2+
sha1=e5234bdcb7e7b620d47a00da076d50f2b63d8649
3+
md5=20dea6992699d6be8a563995d7fe0309
4+
cksum=1731645516
55
upstream_url=https://files.pythonhosted.org/packages/source/k/kiwisolver/kiwisolver-VERSION.tar.gz

‎build/pkgs/kiwisolver/package-version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
1.4.3
1+
1.4.5

‎build/pkgs/matplotlib/checksums.ini‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
tarball=matplotlib-VERSION.tar.gz
2-
sha1=2b78c671f95d52c65154a0dc68372a97582768e5
3-
md5=77ca9a5b42152c9e2aeca1556f08f5ce
4-
cksum=3201608
2+
sha1=b3391b48ab0bf91778064ce5b2226ff2a2658d7c
3+
md5=2c70bea4dea84c090a7ecc8e0bb0748f
4+
cksum=1228885956
55
upstream_url=https://pypi.io/packages/source/m/matplotlib/matplotlib-VERSION.tar.gz

0 commit comments

Comments
 (0)