CVS commit: pkgsrc/devel/py-pyparsing

["Adam Ciarcinski" <adam%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   adam
Date:           Tue Apr 12 07:39:15 UTC 2022

Modified Files:
        pkgsrc/devel/py-pyparsing: Makefile PLIST
Added Files:
        pkgsrc/devel/py-pyparsing/files: setup.py

Log Message:
py-pyparsing: switch back to egg.mk to avoid dependency hell


To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 pkgsrc/devel/py-pyparsing/Makefile
cvs rdiff -u -r1.5 -r1.6 pkgsrc/devel/py-pyparsing/PLIST
cvs rdiff -u -r0 -r1.1 pkgsrc/devel/py-pyparsing/files/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/devel/py-pyparsing/Makefile
diff -u pkgsrc/devel/py-pyparsing/Makefile:1.26 pkgsrc/devel/py-pyparsing/Makefile:1.27
--- pkgsrc/devel/py-pyparsing/Makefile:1.26     Mon Apr 11 11:21:05 2022
+++ pkgsrc/devel/py-pyparsing/Makefile  Tue Apr 12 07:39:15 2022
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2022/04/11 11:21:05 adam Exp $
+# $NetBSD: Makefile,v 1.27 2022/04/12 07:39:15 adam Exp $
 
 DISTNAME=      pyparsing-3.0.8
 PKGNAME=       ${PYPKGPREFIX}-${DISTNAME}
@@ -14,5 +14,10 @@ USE_LANGUAGES=       # none
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27
 
-.include "../../lang/python/wheel.mk"
+# Important: do not use wheel.mk. It depends on py-build,
+# which depends py-packaging, and that depends on this package.
+pre-configure:
+       ${CP} ${FILESDIR}/setup.py ${WRKSRC}/
+
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/devel/py-pyparsing/PLIST
diff -u pkgsrc/devel/py-pyparsing/PLIST:1.5 pkgsrc/devel/py-pyparsing/PLIST:1.6
--- pkgsrc/devel/py-pyparsing/PLIST:1.5 Mon Apr 11 11:21:05 2022
+++ pkgsrc/devel/py-pyparsing/PLIST     Tue Apr 12 07:39:15 2022
@@ -1,32 +1,41 @@
-@comment $NetBSD: PLIST,v 1.5 2022/04/11 11:21:05 adam Exp $
-${PYSITELIB}/${WHEEL_INFODIR}/INSTALLER
-${PYSITELIB}/${WHEEL_INFODIR}/LICENSE
-${PYSITELIB}/${WHEEL_INFODIR}/METADATA
-${PYSITELIB}/${WHEEL_INFODIR}/RECORD
-${PYSITELIB}/${WHEEL_INFODIR}/REQUESTED
-${PYSITELIB}/${WHEEL_INFODIR}/WHEEL
-${PYSITELIB}/${WHEEL_INFODIR}/direct_url.json
+@comment $NetBSD: PLIST,v 1.6 2022/04/12 07:39:15 adam Exp $
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/requires.txt
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/pyparsing/__init__.py
 ${PYSITELIB}/pyparsing/__init__.pyc
+${PYSITELIB}/pyparsing/__init__.pyo
 ${PYSITELIB}/pyparsing/actions.py
 ${PYSITELIB}/pyparsing/actions.pyc
+${PYSITELIB}/pyparsing/actions.pyo
 ${PYSITELIB}/pyparsing/common.py
 ${PYSITELIB}/pyparsing/common.pyc
+${PYSITELIB}/pyparsing/common.pyo
 ${PYSITELIB}/pyparsing/core.py
 ${PYSITELIB}/pyparsing/core.pyc
+${PYSITELIB}/pyparsing/core.pyo
 ${PYSITELIB}/pyparsing/diagram/__init__.py
 ${PYSITELIB}/pyparsing/diagram/__init__.pyc
+${PYSITELIB}/pyparsing/diagram/__init__.pyo
 ${PYSITELIB}/pyparsing/diagram/template.jinja2
 ${PYSITELIB}/pyparsing/exceptions.py
 ${PYSITELIB}/pyparsing/exceptions.pyc
+${PYSITELIB}/pyparsing/exceptions.pyo
 ${PYSITELIB}/pyparsing/helpers.py
 ${PYSITELIB}/pyparsing/helpers.pyc
+${PYSITELIB}/pyparsing/helpers.pyo
 ${PYSITELIB}/pyparsing/py.typed
 ${PYSITELIB}/pyparsing/results.py
 ${PYSITELIB}/pyparsing/results.pyc
+${PYSITELIB}/pyparsing/results.pyo
 ${PYSITELIB}/pyparsing/testing.py
 ${PYSITELIB}/pyparsing/testing.pyc
+${PYSITELIB}/pyparsing/testing.pyo
 ${PYSITELIB}/pyparsing/unicode.py
 ${PYSITELIB}/pyparsing/unicode.pyc
+${PYSITELIB}/pyparsing/unicode.pyo
 ${PYSITELIB}/pyparsing/util.py
 ${PYSITELIB}/pyparsing/util.pyc
+${PYSITELIB}/pyparsing/util.pyo

Added files:

Index: pkgsrc/devel/py-pyparsing/files/setup.py
diff -u /dev/null pkgsrc/devel/py-pyparsing/files/setup.py:1.1
--- /dev/null   Tue Apr 12 07:39:15 2022
+++ pkgsrc/devel/py-pyparsing/files/setup.py    Tue Apr 12 07:39:15 2022
@@ -0,0 +1,24 @@
+#!/usr/bin/env python
+
+from setuptools import setup
+
+packages = \
+['pyparsing', 'pyparsing.diagram']
+
+package_data = \
+{'': ['*']}
+
+extras_require = \
+{'diagrams': ['railroad-diagrams', 'jinja2']}
+
+setup(name='pyparsing',
+      version='3.0.8',
+      description='pyparsing module - Classes and methods to define and execute parsing grammars',
+      author=None,
+      author_email='Paul McGuire <ptmcg.gm+pyparsing%gmail.com@localhost>',
+      url=None,
+      packages=packages,
+      package_data=package_data,
+      extras_require=extras_require,
+      python_requires='>=3.6.8',
+     )