From e0fcc8039bbe07ec278530f47aa9549179401116 Mon Sep 17 00:00:00 2001 From: "Andrew J. Hesford" Date: Thu, 11 Aug 2022 08:33:08 -0400 Subject: [PATCH] python3-matplotlib: update to 3.5.3. --- .../patches/fix-setup.patch | 26 +++++++++++++++++++ srcpkgs/python3-matplotlib/template | 10 +++---- 2 files changed, 29 insertions(+), 7 deletions(-) create mode 100644 srcpkgs/python3-matplotlib/patches/fix-setup.patch diff --git a/srcpkgs/python3-matplotlib/patches/fix-setup.patch b/srcpkgs/python3-matplotlib/patches/fix-setup.patch new file mode 100644 index 00000000000..f987d97e4d5 --- /dev/null +++ b/srcpkgs/python3-matplotlib/patches/fix-setup.patch @@ -0,0 +1,26 @@ +The maximum version of setuptools_scm is pinned below 6 for no apparent reason +and Void ships 7.x; remove the upper version restriction and also drop the +requirement for setuptools_scm_git_archive that was originally patched out in +the template. + +--- a/setup.py ++++ b/setup.py +@@ -316,8 +316,7 @@ + setup_requires=[ + "certifi>=2020.06.20", + "numpy>=1.17", +- "setuptools_scm>=4,<7", +- "setuptools_scm_git_archive", ++ "setuptools_scm>=4", + ], + install_requires=[ + "cycler>=0.10", +@@ -330,7 +329,7 @@ + "python-dateutil>=2.7", + ] + ( + # Installing from a git checkout that is not producing a wheel. +- ["setuptools_scm>=4,<7"] if ( ++ ["setuptools_scm>=4"] if ( + Path(__file__).with_name(".git").exists() and + os.environ.get("CIBUILDWHEEL", "0") != "1" + ) else [] diff --git a/srcpkgs/python3-matplotlib/template b/srcpkgs/python3-matplotlib/template index e4d44cb11ed..b71abf2aecd 100644 --- a/srcpkgs/python3-matplotlib/template +++ b/srcpkgs/python3-matplotlib/template @@ -1,8 +1,8 @@ # Template file for 'python3-matplotlib' pkgname=python3-matplotlib reverts="3.5.2_1" -version=3.5.1 -revision=2 +version=3.5.3 +revision=1 wrksrc="matplotlib-${version}" build_style=python3-module build_helper="numpy" @@ -15,15 +15,11 @@ maintainer="Andrew J. Hesford " license="custom:matplotlib, BSD-3-Clause, MIT" homepage="https://matplotlib.org/" distfiles="https://github.com/matplotlib/matplotlib/archive/v${version}.tar.gz" -checksum=9683da9a0c84d1c42d1bf92ecf6e012d302406a38fd987e3dfbcb7b58b2eea2d +checksum=9d6ee7190fde3cb0c6285d462a0258c9735a72c7b532321a3983e05076aa41dc replaces="python3-matplotlib-data>=0" # Comparison of images is too frail for validation make_check="no" -post_patch() { - vsed -e '/setuptools_scm_git_archive/d' -i setup.py -} - pre_build() { cat <<-EOF > mplsetup.cfg [libs]