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
cvs diff -r1.83 -r1.84 pkgsrc/graphics/py-matplotlib/Makefile (expand / switch to unified diff)

--- 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,17 +1,18 @@ @@ -1,17 +1,18 @@
1# $NetBSD: Makefile,v 1.83 2023/07/10 21:22:29 adam Exp $ 1# $NetBSD: Makefile,v 1.84 2023/07/20 14:46:43 bacon Exp $
2 2
3DISTNAME= matplotlib-3.7.2 3DISTNAME= matplotlib-3.7.2
4PKGNAME= ${PYPKGPREFIX}-${DISTNAME} 4PKGNAME= ${PYPKGPREFIX}-${DISTNAME}
 5PKGREVISION= 1
5CATEGORIES= graphics python 6CATEGORIES= graphics python
6MASTER_SITES= ${MASTER_SITE_PYPI:=m/matplotlib/} 7MASTER_SITES= ${MASTER_SITE_PYPI:=m/matplotlib/}
7 8
8MAINTAINER= pkgsrc-users@NetBSD.org 9MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://matplotlib.org/ 10HOMEPAGE= https://matplotlib.org/
10COMMENT= Matlab-style plotting package for Python 11COMMENT= Matlab-style plotting package for Python
11# LICENSE= see ${WRKSRC}/LICENSE/LICENSE 12# LICENSE= see ${WRKSRC}/LICENSE/LICENSE
12 13
13TOOL_DEPENDS+= ${PYPKGPREFIX}-certifi>=2020.06.20:../../security/py-certifi 14TOOL_DEPENDS+= ${PYPKGPREFIX}-certifi>=2020.06.20:../../security/py-certifi
14TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=7:../../devel/py-setuptools_scm 15TOOL_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm>=7:../../devel/py-setuptools_scm
15DEPENDS+= ${PYPKGPREFIX}-Pillow>=6.2.0:../../graphics/py-Pillow 16DEPENDS+= ${PYPKGPREFIX}-Pillow>=6.2.0:../../graphics/py-Pillow
16DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo 17DEPENDS+= ${PYPKGPREFIX}-cairo-[0-9]*:../../graphics/py-cairo
17DEPENDS+= ${PYPKGPREFIX}-contourpy>=1.0.1:../../graphics/py-contourpy 18DEPENDS+= ${PYPKGPREFIX}-contourpy>=1.0.1:../../graphics/py-contourpy
@@ -20,21 +21,24 @@ DEPENDS+= ${PYPKGPREFIX}-dateutil>=2.7:. @@ -20,21 +21,24 @@ DEPENDS+= ${PYPKGPREFIX}-dateutil>=2.7:.
20DEPENDS+= ${PYPKGPREFIX}-fonttools>=4.22.0:../../fonts/py-fonttools 21DEPENDS+= ${PYPKGPREFIX}-fonttools>=4.22.0:../../fonts/py-fonttools
21DEPENDS+= ${PYPKGPREFIX}-kiwisolver>=1.0.1:../../math/py-kiwisolver 22DEPENDS+= ${PYPKGPREFIX}-kiwisolver>=1.0.1:../../math/py-kiwisolver
22DEPENDS+= ${PYPKGPREFIX}-packaging>=20.0:../../devel/py-packaging 23DEPENDS+= ${PYPKGPREFIX}-packaging>=20.0:../../devel/py-packaging
23DEPENDS+= ${PYPKGPREFIX}-pyparsing>=2.2.1:../../devel/py-pyparsing 24DEPENDS+= ${PYPKGPREFIX}-pyparsing>=2.2.1:../../devel/py-pyparsing
24TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test 25TEST_DEPENDS+= ${PYPKGPREFIX}-test-[0-9]*:../../devel/py-test
25 26
26USE_LANGUAGES= c c++ 27USE_LANGUAGES= c c++
27USE_TOOLS+= pkg-config 28USE_TOOLS+= pkg-config
28 29
29PYSETUPTESTTARGET= pytest 30PYSETUPTESTTARGET= pytest
30 31
31PYTHON_VERSIONS_INCOMPATIBLE= 27 37 38 32PYTHON_VERSIONS_INCOMPATIBLE= 27 37 38
32 33
 34post-patch:
 35 ${RM} ${WRKSRC}/lib/matplotlib.egg-info/requires.txt.orig
 36
33.include "../../devel/py-pybind11/buildlink3.mk" 37.include "../../devel/py-pybind11/buildlink3.mk"
34.include "../../devel/zlib/buildlink3.mk" 38.include "../../devel/zlib/buildlink3.mk"
35.include "../../graphics/freetype2/buildlink3.mk" 39.include "../../graphics/freetype2/buildlink3.mk"
36.include "../../graphics/png/buildlink3.mk" 40.include "../../graphics/png/buildlink3.mk"
37.include "../../lang/python/egg.mk" 41.include "../../lang/python/egg.mk"
38.include "../../math/py-numpy/buildlink3.mk" 42.include "../../math/py-numpy/buildlink3.mk"
39.include "../../math/qhull/buildlink3.mk" 43.include "../../math/qhull/buildlink3.mk"
40.include "../../mk/bsd.pkg.mk" 44.include "../../mk/bsd.pkg.mk"
cvs diff -r1.54 -r1.55 pkgsrc/graphics/py-matplotlib/distinfo (expand / switch to unified diff)

--- 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 @@ @@ -1,6 +1,9 @@
1$NetBSD: distinfo,v 1.54 2023/07/10 21:22:29 adam Exp $ 1$NetBSD: distinfo,v 1.55 2023/07/20 14:46:43 bacon Exp $
2 2
3BLAKE2s (matplotlib-3.7.2.tar.gz) = 64843ae84c2d9270682380569fef63795b56178e695e74b845c37ebd654bcd30 3BLAKE2s (matplotlib-3.7.2.tar.gz) = 64843ae84c2d9270682380569fef63795b56178e695e74b845c37ebd654bcd30
4SHA512 (matplotlib-3.7.2.tar.gz) = 3ddb223c869c01cf71ab65a628a3c996eed1ff8b2375c02e3158a5750652a5d8277a55706e50890c15c14c7a104db01f01b01ca8964f85b6ffec104fc273872d 4SHA512 (matplotlib-3.7.2.tar.gz) = 3ddb223c869c01cf71ab65a628a3c996eed1ff8b2375c02e3158a5750652a5d8277a55706e50890c15c14c7a104db01f01b01ca8964f85b6ffec104fc273872d
5Size (matplotlib-3.7.2.tar.gz) = 38095843 bytes 5Size (matplotlib-3.7.2.tar.gz) = 38095843 bytes
 6SHA1 (patch-environment.yml) = a86cf81f749f862f65af7fda1b4b7e7a2601cfa0
 7SHA1 (patch-lib_matplotlib.egg-info_requires.txt) = c4ed622c0cc799352c7ed9f31986f7efba4591f5
6SHA1 (patch-mplsetup.cfg) = 06bf93f112ab4ed4604179c1cc7fd2bdee62b56d 8SHA1 (patch-mplsetup.cfg) = 06bf93f112ab4ed4604179c1cc7fd2bdee62b56d
 9SHA1 (patch-setup.py) = 8e370514af5577677b05c6362792664b5762853a
File Added: pkgsrc/graphics/py-matplotlib/patches/patch-environment.yml
File Added: pkgsrc/graphics/py-matplotlib/patches/patch-lib_matplotlib.egg-info_requires.txt
File Added: pkgsrc/graphics/py-matplotlib/patches/Attic/patch-setup.py
$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.