split py2-parsing off from py-parsing, update to py3-parsing-3.0.9,

and fix up deps
This commit is contained in:
sthen 2022-08-10 13:54:41 +00:00
parent dac14391bc
commit a00cf03ee0
11 changed files with 102 additions and 22 deletions

View File

@ -1452,7 +1452,7 @@
SUBDIR += py-ordered-set,python3
SUBDIR += py-parallel,python3
SUBDIR += py-parsedatetime,python3
SUBDIR += py-parsing
SUBDIR += py2-parsing
SUBDIR += py-parsing,python3
SUBDIR += py-parso,python3
SUBDIR += py-path.py,python3

View File

@ -1,8 +1,6 @@
COMMENT = Python parsing module
# last py2 version; if updating then needs to be split into py2-parsing for
# py-miasm and py2-compatible version of py-packaging
MODPY_EGG_VERSION = 2.4.5
MODPY_EGG_VERSION = 3.0.9
DISTNAME = pyparsing-${MODPY_EGG_VERSION}
PKGNAME = ${DISTNAME:S/py/py-/}
CATEGORIES = devel
@ -13,12 +11,21 @@ HOMEPAGE = http://pyparsing.wikispaces.com/
PERMIT_PACKAGE = Yes
MODULES = lang/python
MODPY_SETUPTOOLS = Yes
MODPY_PI = Yes
FLAVORS = python3
FLAVOR ?=
FLAVOR = python3
NO_TEST = Yes
# test_diagram needs railroad
MODPY_PYTEST_ARGS = --ignore tests/test_diagram.py tests
#MODPY_PEP517 = flit_core
BUILD_DEPENDS += devel/py-flit_core${MODPY_FLAVOR}
do-build:
cd ${WRKSRC} && pip wheel -v --no-index --no-cache --no-deps --no-build-isolation .
do-install:
${INSTALL_DATA_DIR} ${WRKINST}${MODPY_LIBDIR}; \
${MODPY_BIN} -m installer -d ${WRKINST} ${WRKSRC}/*.whl
.include <bsd.port.mk>

View File

@ -1,2 +1,2 @@
SHA256 (pyparsing-2.4.5.tar.gz) = TKYgAb42fwG9PpLsu3kHAnKp1JZNzmpIqC/wuLx+aDo=
SIZE (pyparsing-2.4.5.tar.gz) = 644726
SHA256 (pyparsing-3.0.9.tar.gz) = KwIOz30htofyGbceytNjH2RKR/AUA/odEDawxkFtcPs=
SIZE (pyparsing-3.0.9.tar.gz) = 1999906

View File

@ -1,8 +1,43 @@
lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}pyparsing.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pyparsing-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/pyparsing-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/pyparsing-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/pyparsing-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/pyparsing-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/pyparsing.py
lib/python${MODPY_VERSION}/site-packages/pyparsing/
lib/python${MODPY_VERSION}/site-packages/pyparsing-${MODPY_EGG_VERSION}.dist-info/
lib/python${MODPY_VERSION}/site-packages/pyparsing-${MODPY_EGG_VERSION}.dist-info/LICENSE
lib/python${MODPY_VERSION}/site-packages/pyparsing-${MODPY_EGG_VERSION}.dist-info/METADATA
lib/python${MODPY_VERSION}/site-packages/pyparsing-${MODPY_EGG_VERSION}.dist-info/RECORD
lib/python${MODPY_VERSION}/site-packages/pyparsing-${MODPY_EGG_VERSION}.dist-info/WHEEL
lib/python${MODPY_VERSION}/site-packages/pyparsing/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pyparsing/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/pyparsing/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/pyparsing/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pyparsing/${MODPY_PYCACHE}actions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/pyparsing/${MODPY_PYCACHE}actions.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pyparsing/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/pyparsing/${MODPY_PYCACHE}common.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pyparsing/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/pyparsing/${MODPY_PYCACHE}core.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pyparsing/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/pyparsing/${MODPY_PYCACHE}exceptions.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pyparsing/${MODPY_PYCACHE}helpers.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/pyparsing/${MODPY_PYCACHE}helpers.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pyparsing/${MODPY_PYCACHE}results.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/pyparsing/${MODPY_PYCACHE}results.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pyparsing/${MODPY_PYCACHE}testing.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/pyparsing/${MODPY_PYCACHE}testing.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pyparsing/${MODPY_PYCACHE}unicode.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/pyparsing/${MODPY_PYCACHE}unicode.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pyparsing/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/pyparsing/${MODPY_PYCACHE}util.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pyparsing/actions.py
lib/python${MODPY_VERSION}/site-packages/pyparsing/common.py
lib/python${MODPY_VERSION}/site-packages/pyparsing/core.py
lib/python${MODPY_VERSION}/site-packages/pyparsing/diagram/
lib/python${MODPY_VERSION}/site-packages/pyparsing/diagram/__init__.py
${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/pyparsing/diagram/${MODPY_PYCACHE}/
lib/python${MODPY_VERSION}/site-packages/pyparsing/diagram/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
lib/python${MODPY_VERSION}/site-packages/pyparsing/diagram/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
lib/python${MODPY_VERSION}/site-packages/pyparsing/exceptions.py
lib/python${MODPY_VERSION}/site-packages/pyparsing/helpers.py
lib/python${MODPY_VERSION}/site-packages/pyparsing/py.typed
lib/python${MODPY_VERSION}/site-packages/pyparsing/results.py
lib/python${MODPY_VERSION}/site-packages/pyparsing/testing.py
lib/python${MODPY_VERSION}/site-packages/pyparsing/unicode.py
lib/python${MODPY_VERSION}/site-packages/pyparsing/util.py

View File

@ -0,0 +1,23 @@
COMMENT = Python parsing module
MODPY_EGG_VERSION = 2.4.5
DISTNAME = pyparsing-${MODPY_EGG_VERSION}
PKGNAME = ${DISTNAME:S/py/py-/}
CATEGORIES = devel
REVISION = 0
HOMEPAGE = http://pyparsing.wikispaces.com/
# MIT
PERMIT_PACKAGE = Yes
MODULES = lang/python
MODPY_SETUPTOOLS = Yes
MODPY_PI = Yes
MODPY_VERSION = ${MODPY_DEFAULT_VERSION_2}
NO_TEST = Yes
.include <bsd.port.mk>

View File

@ -0,0 +1,2 @@
SHA256 (pyparsing-2.4.5.tar.gz) = TKYgAb42fwG9PpLsu3kHAnKp1JZNzmpIqC/wuLx+aDo=
SIZE (pyparsing-2.4.5.tar.gz) = 644726

View File

@ -0,0 +1,4 @@
pyparsing is an alternative approach to creating and executing simple
grammars, vs. the traditional lex/yacc approach, or the use of regular
expressions. The parsing module provides a library of classes that
client code uses to construct the grammar directly in Python code.

View File

@ -0,0 +1,8 @@
@pkgpath devel/${MODPY_PY_PREFIX}parsing
lib/python${MODPY_VERSION}/site-packages/pyparsing-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
lib/python${MODPY_VERSION}/site-packages/pyparsing-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
lib/python${MODPY_VERSION}/site-packages/pyparsing-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
lib/python${MODPY_VERSION}/site-packages/pyparsing-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
lib/python${MODPY_VERSION}/site-packages/pyparsing-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
lib/python${MODPY_VERSION}/site-packages/pyparsing.py
lib/python${MODPY_VERSION}/site-packages/${MODPY_PYCACHE}pyparsing.${MODPY_PYC_MAGIC_TAG}pyc

View File

@ -21,7 +21,7 @@ MODPY_SETUPTOOLS = Yes
EXTRACT_SUFX = .zip
RUN_DEPENDS += ${MODPY_TKINTER_DEPENDS} \
devel/py-parsing
devel/py2-parsing
MODPY_ADJ_FILES = oletools/*.py

View File

@ -26,7 +26,7 @@ WANTLIB += pthread ${MODPY_WANTLIB}
RUN_DEPENDS = security/py-elfesteem \
devel/py-llvmlite \
devel/py-parsing
devel/py2-parsing
TEST_DEPENDS = devel/py-cparser

View File

@ -3,10 +3,10 @@ COMMENT = core utilities for Python packages
# if moving to >=21.0 this needs splitting off to py2-packaging
# (py2-setuptools requires it)
MODPY_EGG_VERSION = 20.9
REVISION = 2
DISTNAME = packaging-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
REVISION = 1
CATEGORIES = sysutils
@ -20,8 +20,6 @@ MODULES = lang/python
MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
RUN_DEPENDS = devel/py-parsing${MODPY_FLAVOR}>=2.0.2
MODPY_PYTEST = Yes
FLAVORS = python3
@ -30,6 +28,9 @@ FLAVOR ?=
.if ${FLAVOR:Mpython3}
# no tests for py2
TEST_DEPENDS = devel/py-pretend${MODPY_FLAVOR}
RUN_DEPENDS = devel/py-parsing${MODPY_FLAVOR}>=2.0.2
.else
RUN_DEPENDS = devel/py2-parsing
.endif
.include <bsd.port.mk>