Thu Jul 20 14:46:43 2023 UTC ()
graphics/py-matplotlib: Unbreak via pyparsing dep hack
Matplotlib currently forbids our version of pyparsing (3.1.0).
The issue only affects error messages.
This update hacks out the pyparsing < 3.1.0 requirement so that
matplotlib dependents can at least function, though some error
messages won't pass through properly.
https://github.com/matplotlib/matplotlib/issues/26152
(bacon)
diff -r1.83 -r1.84 pkgsrc/graphics/py-matplotlib/Makefile
diff -r1.54 -r1.55 pkgsrc/graphics/py-matplotlib/distinfo
diff -r0 -r1.1 pkgsrc/graphics/py-matplotlib/patches/patch-environment.yml
diff -r0 -r1.1 pkgsrc/graphics/py-matplotlib/patches/patch-lib_matplotlib.egg-info_requires.txt
diff -r0 -r1.5 pkgsrc/graphics/py-matplotlib/patches/patch-setup.py
Thu Jul 20 23:46:43 2023
Thu Jan 1 09:00:00 1970
pkgsrc/graphics/py-matplotlib/patches/patch-environment.yml,v
anoncvs not yet been updated
Thu Jul 20 23:46:43 2023
Thu Jan 1 09:00:00 1970
pkgsrc/graphics/py-matplotlib/patches/patch-lib_matplotlib.egg-info_requires.txt,v
anoncvs not yet been updated
--- pkgsrc/graphics/py-matplotlib/Makefile 2023/07/10 21:22:29 1.83
+++ pkgsrc/graphics/py-matplotlib/Makefile 2023/07/20 14:46:43 1.84
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.83 2023/07/10 21:22:29 adam Exp $
+# $NetBSD: Makefile,v 1.84 2023/07/20 14:46:43 bacon Exp $
DISTNAME= matplotlib-3.7.2
PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
+PKGREVISION= 1
CATEGORIES= graphics python
MASTER_SITES= ${MASTER_SITE_PYPI:=m/matplotlib/}
@@ -29,6 +30,9 @@
PYSETUPTESTTARGET= pytest
PYTHON_VERSIONS_INCOMPATIBLE= 27 37 38
+
+post-patch:
+ ${RM} ${WRKSRC}/lib/matplotlib.egg-info/requires.txt.orig
.include "../../devel/py-pybind11/buildlink3.mk"
.include "../../devel/zlib/buildlink3.mk"
--- pkgsrc/graphics/py-matplotlib/distinfo 2023/07/10 21:22:29 1.54
+++ pkgsrc/graphics/py-matplotlib/distinfo 2023/07/20 14:46:43 1.55
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.54 2023/07/10 21:22:29 adam Exp $
+$NetBSD: distinfo,v 1.55 2023/07/20 14:46:43 bacon Exp $
BLAKE2s (matplotlib-3.7.2.tar.gz) = 64843ae84c2d9270682380569fef63795b56178e695e74b845c37ebd654bcd30
SHA512 (matplotlib-3.7.2.tar.gz) = 3ddb223c869c01cf71ab65a628a3c996eed1ff8b2375c02e3158a5750652a5d8277a55706e50890c15c14c7a104db01f01b01ca8964f85b6ffec104fc273872d
Size (matplotlib-3.7.2.tar.gz) = 38095843 bytes
+SHA1 (patch-environment.yml) = a86cf81f749f862f65af7fda1b4b7e7a2601cfa0
+SHA1 (patch-lib_matplotlib.egg-info_requires.txt) = c4ed622c0cc799352c7ed9f31986f7efba4591f5
SHA1 (patch-mplsetup.cfg) = 06bf93f112ab4ed4604179c1cc7fd2bdee62b56d
+SHA1 (patch-setup.py) = 8e370514af5577677b05c6362792664b5762853a
$NetBSD: patch-setup.py,v 1.5 2023/07/20 14:46:43 bacon Exp $
# Hack to allow apps to run despite known issues
--- setup.py.orig 2023-07-20 13:08:02.696854685 +0000
+++ setup.py
@@ -325,7 +325,7 @@ setup( # Finally, pass this all along t
"numpy>=1.20",
"packaging>=20.0",
"pillow>=6.2.0",
- "pyparsing>=2.3.1,<3.1",
+ "pyparsing>=2.3.1",
"python-dateutil>=2.7",
] + (
# Installing from a git checkout that is not producing a wheel.