CVS commit: pkgsrc/graphics/py-matplotlib

["Jason Bacon" <bacon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   bacon
Date:           Thu Jul 20 14:46:43 UTC 2023

Modified Files:
        pkgsrc/graphics/py-matplotlib: Makefile distinfo
Added Files:
        pkgsrc/graphics/py-matplotlib/patches: patch-environment.yml
            patch-lib_matplotlib.egg-info_requires.txt patch-setup.py

Log Message:
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


To generate a diff of this commit:
cvs rdiff -u -r1.83 -r1.84 pkgsrc/graphics/py-matplotlib/Makefile
cvs rdiff -u -r1.54 -r1.55 pkgsrc/graphics/py-matplotlib/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/py-matplotlib/patches/patch-environment.yml \
    pkgsrc/graphics/py-matplotlib/patches/patch-lib_matplotlib.egg-info_requires.txt
cvs rdiff -u -r0 -r1.5 pkgsrc/graphics/py-matplotlib/patches/patch-setup.py

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/py-matplotlib/Makefile
diff -u pkgsrc/graphics/py-matplotlib/Makefile:1.83 pkgsrc/graphics/py-matplotlib/Makefile:1.84
--- pkgsrc/graphics/py-matplotlib/Makefile:1.83 Mon Jul 10 21:22:29 2023
+++ pkgsrc/graphics/py-matplotlib/Makefile      Thu Jul 20 14:46:43 2023
@@ -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/}
 
@@ -30,6 +31,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"
 .include "../../graphics/freetype2/buildlink3.mk"

Index: pkgsrc/graphics/py-matplotlib/distinfo
diff -u pkgsrc/graphics/py-matplotlib/distinfo:1.54 pkgsrc/graphics/py-matplotlib/distinfo:1.55
--- pkgsrc/graphics/py-matplotlib/distinfo:1.54 Mon Jul 10 21:22:29 2023
+++ pkgsrc/graphics/py-matplotlib/distinfo      Thu Jul 20 14:46:43 2023
@@ -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

Added files:

Index: pkgsrc/graphics/py-matplotlib/patches/patch-environment.yml
diff -u /dev/null pkgsrc/graphics/py-matplotlib/patches/patch-environment.yml:1.1
--- /dev/null   Thu Jul 20 14:46:43 2023
+++ pkgsrc/graphics/py-matplotlib/patches/patch-environment.yml Thu Jul 20 14:46:43 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-environment.yml,v 1.1 2023/07/20 14:46:43 bacon Exp $
+
+# Hack to allow apps to run despite known issues
+
+--- environment.yml.orig       2023-07-20 13:09:50.054239819 +0000
++++ environment.yml
+@@ -19,7 +19,7 @@ dependencies:
+   - pillow>=6.2
+   - pybind11>=2.6.0
+   - pygobject
+-  - pyparsing!=3.1.0
++  - pyparsing>=2.3.1
+   - pyqt
+   - python-dateutil>=2.1
+   - setuptools
Index: pkgsrc/graphics/py-matplotlib/patches/patch-lib_matplotlib.egg-info_requires.txt
diff -u /dev/null pkgsrc/graphics/py-matplotlib/patches/patch-lib_matplotlib.egg-info_requires.txt:1.1
--- /dev/null   Thu Jul 20 14:46:43 2023
+++ pkgsrc/graphics/py-matplotlib/patches/patch-lib_matplotlib.egg-info_requires.txt    Thu Jul 20 14:46:43 2023
@@ -0,0 +1,15 @@
+$NetBSD: patch-lib_matplotlib.egg-info_requires.txt,v 1.1 2023/07/20 14:46:43 bacon Exp $
+
+# Hack to allow apps to run despite known issues
+
+--- lib/matplotlib.egg-info/requires.txt.orig  2023-07-20 13:09:04.809660522 +0000
++++ lib/matplotlib.egg-info/requires.txt
+@@ -5,7 +5,7 @@ kiwisolver>=1.0.1
+ numpy>=1.20
+ packaging>=20.0
+ pillow>=6.2.0
+-pyparsing<3.1,>=2.3.1
++pyparsing>=2.3.1
+ python-dateutil>=2.7
+ setuptools_scm>=7
+ 

Index: pkgsrc/graphics/py-matplotlib/patches/patch-setup.py
diff -u /dev/null pkgsrc/graphics/py-matplotlib/patches/patch-setup.py:1.5
--- /dev/null   Thu Jul 20 14:46:43 2023
+++ pkgsrc/graphics/py-matplotlib/patches/patch-setup.py        Thu Jul 20 14:46:43 2023
@@ -0,0 +1,15 @@
+$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.