From 71154e2ac1dadd327ef948f70fa91f48b7d925ca Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Thu, 20 Jun 2024 19:31:02 -0700 Subject: [PATCH 1/6] build/pkgs/contourpy: Update to 1.2.1 --- build/pkgs/contourpy/checksums.ini | 4 ++-- build/pkgs/contourpy/package-version.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/pkgs/contourpy/checksums.ini b/build/pkgs/contourpy/checksums.ini index 2823ef85c08..78d5d4ec488 100644 --- a/build/pkgs/contourpy/checksums.ini +++ b/build/pkgs/contourpy/checksums.ini @@ -1,4 +1,4 @@ tarball=contourpy-VERSION.tar.gz -sha1=eb8520cb7172aa8b957d8ba2d09e8f6d9a068d2a -sha256=96ba37c2e24b7212a77da85004c38e7c4d155d3e72a45eeaf22c1f03f607e8ab +sha1=3166ff1ae1aa6565d4ccbdb2238a42e53bd3859a +sha256=4d8908b3bee1c889e547867ca4cdc54e5ab6be6d3e078556814a22457f49423c 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 524cb55242b..6085e946503 100644 --- a/build/pkgs/contourpy/package-version.txt +++ b/build/pkgs/contourpy/package-version.txt @@ -1 +1 @@ -1.1.1 +1.2.1 From 17a7ae57e17d806b0a561b1a69ca77d3a4d8c95f Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Thu, 20 Jun 2024 19:31:21 -0700 Subject: [PATCH 2/6] build/pkgs/matplotlib: Update to 3.9.0 --- build/pkgs/matplotlib/checksums.ini | 4 ++-- build/pkgs/matplotlib/package-version.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/pkgs/matplotlib/checksums.ini b/build/pkgs/matplotlib/checksums.ini index 317be590bcf..ca4e35090e9 100644 --- a/build/pkgs/matplotlib/checksums.ini +++ b/build/pkgs/matplotlib/checksums.ini @@ -1,4 +1,4 @@ tarball=matplotlib-VERSION.tar.gz -sha1=b3391b48ab0bf91778064ce5b2226ff2a2658d7c -sha256=df8505e1c19d5c2c26aff3497a7cbd3ccfc2e97043d1e4db3e76afa399164b69 +sha1=46891d128d6f8fd0f80d9a7bf3b12d1a00e236a0 +sha256=e6d29ea6c19e34b30fb7d88b7081f869a03014f66fe06d62cc77d5a6ea88ed7a 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 19811903a7f..a5c4c763394 100644 --- a/build/pkgs/matplotlib/package-version.txt +++ b/build/pkgs/matplotlib/package-version.txt @@ -1 +1 @@ -3.8.0 +3.9.0 From b858adfc5ca95b71b55c12dda910c41792e7421d Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Thu, 20 Jun 2024 19:45:21 -0700 Subject: [PATCH 3/6] build/pkgs/matplotlib: Update for meson_python build system --- build/pkgs/matplotlib/dependencies | 2 +- build/pkgs/matplotlib/spkg-install.in | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build/pkgs/matplotlib/dependencies b/build/pkgs/matplotlib/dependencies index 8abcba00ee8..214a1904da7 100644 --- a/build/pkgs/matplotlib/dependencies +++ b/build/pkgs/matplotlib/dependencies @@ -1,4 +1,4 @@ - numpy freetype pillow dateutil pyparsing tornado cycler qhull fonttools contourpy | $(PYTHON_TOOLCHAIN) kiwisolver certifi setuptools_scm $(PYTHON) + numpy packaging freetype pillow dateutil pyparsing cycler qhull fonttools contourpy kiwisolver importlib_resources | $(PYTHON_TOOLCHAIN) pybind11 meson_python setuptools_scm $(PYTHON) ---------- All lines of this file are ignored except the first. diff --git a/build/pkgs/matplotlib/spkg-install.in b/build/pkgs/matplotlib/spkg-install.in index e8cbd4e759d..2a626e9bdfb 100644 --- a/build/pkgs/matplotlib/spkg-install.in +++ b/build/pkgs/matplotlib/spkg-install.in @@ -1,6 +1,8 @@ -# Write a configuration file to src/setup.cfg +# Write a configuration file to src/mplsetup.cfg python3 make-setup-config.py +# 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 # Finally install From 9980ab4cf59b44da9c6bc974f2f96bf80f43d9f5 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Thu, 20 Jun 2024 20:17:21 -0700 Subject: [PATCH 4/6] build/pkgs/matplotlib: Update config for meson_python build system --- build/pkgs/matplotlib/spkg-install.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/build/pkgs/matplotlib/spkg-install.in b/build/pkgs/matplotlib/spkg-install.in index 2a626e9bdfb..f3c8d16e4af 100644 --- a/build/pkgs/matplotlib/spkg-install.in +++ b/build/pkgs/matplotlib/spkg-install.in @@ -6,4 +6,7 @@ export CXX=$(echo "$CXX" | sed 's/-std=[a-z0-9+]*//g') cd src # Finally install -sdh_pip_install . +# https://matplotlib.org/stable/install/dependencies.html#use-system-libraries +sdh_pip_install -C setup-args="-Dsystem-freetype=true" \ + -C setup-args="-Dsystem-qhull=true" \ + . From 910c569f88715f2ed6ff1a2c2fa60c7fd1aee4bf Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Mon, 22 Jul 2024 14:03:32 +0100 Subject: [PATCH 5/6] build/pkgs/matplotlib: Update to 3.9.1 --- build/pkgs/matplotlib/checksums.ini | 4 ++-- build/pkgs/matplotlib/package-version.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/pkgs/matplotlib/checksums.ini b/build/pkgs/matplotlib/checksums.ini index ca4e35090e9..84542a8076a 100644 --- a/build/pkgs/matplotlib/checksums.ini +++ b/build/pkgs/matplotlib/checksums.ini @@ -1,4 +1,4 @@ tarball=matplotlib-VERSION.tar.gz -sha1=46891d128d6f8fd0f80d9a7bf3b12d1a00e236a0 -sha256=e6d29ea6c19e34b30fb7d88b7081f869a03014f66fe06d62cc77d5a6ea88ed7a +sha1=b98c9e75d53c85a5c0340adc87da0a405966837f +sha256=de06b19b8db95dd33d0dc17c926c7c9ebed9f572074b6fac4f65068a6814d010 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 a5c4c763394..6bd10744ae8 100644 --- a/build/pkgs/matplotlib/package-version.txt +++ b/build/pkgs/matplotlib/package-version.txt @@ -1 +1 @@ -3.9.0 +3.9.1 From 7c6a64939612ff86b8dcf0a0423ff3cb3d1d4a84 Mon Sep 17 00:00:00 2001 From: Matthias Koeppe Date: Sat, 17 Aug 2024 23:06:44 -0700 Subject: [PATCH 6/6] build/pkgs/matplotlib: Update to 3.9.2 --- build/pkgs/matplotlib/checksums.ini | 4 ++-- build/pkgs/matplotlib/package-version.txt | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/pkgs/matplotlib/checksums.ini b/build/pkgs/matplotlib/checksums.ini index 84542a8076a..1a89d8b02b9 100644 --- a/build/pkgs/matplotlib/checksums.ini +++ b/build/pkgs/matplotlib/checksums.ini @@ -1,4 +1,4 @@ tarball=matplotlib-VERSION.tar.gz -sha1=b98c9e75d53c85a5c0340adc87da0a405966837f -sha256=de06b19b8db95dd33d0dc17c926c7c9ebed9f572074b6fac4f65068a6814d010 +sha1=6788a6d445c0fe34baf7022705e5e4e0035d90b0 +sha256=96ab43906269ca64a6366934106fa01534454a69e471b7bf3d79083981aaab92 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 6bd10744ae8..2009c7dfad9 100644 --- a/build/pkgs/matplotlib/package-version.txt +++ b/build/pkgs/matplotlib/package-version.txt @@ -1 +1 @@ -3.9.1 +3.9.2