diff --git a/textproc/py-jq/Makefile b/textproc/py-jq/Makefile index 05f8e0f6bb1d..383b0888bc2b 100644 --- a/textproc/py-jq/Makefile +++ b/textproc/py-jq/Makefile @@ -1,40 +1,46 @@ PORTNAME= jq -PORTVERSION= 1.2.2 +PORTVERSION= 1.3.0 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP LOCAL/mandree:mandree PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} jq-1.2.1-tests${EXTRACT_SUFX}:mandree MAINTAINER= mandree@FreeBSD.org COMMENT= jq.py: a lightweight and flexible JSON processor WWW= https://github.com/mwilliamson/jq.py LICENSE= BSD2CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${RUN_DEPENDS} LIB_DEPENDS= libjq.so:textproc/jq \ libonig.so:devel/oniguruma RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}setuptools>=0:devel/py-setuptools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} -USES= localbase python:3.7-3.10 +USES= localbase python USE_PYTHON= autoplist distutils post-extract: # move tests into place - unchanged between 1.2.1 and 1.2.2 - ${MV} ${WRKDIR}/jq-1.2.1/* ${WRKDIR}/jq-1.2.2/ + ${MV} ${WRKDIR}/jq-1.2.1/* ${WRKSRC} post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/jq*.so +.if defined(_MANDREE_FORCE_POUDRIERE_TEST_) +BUILD_DEPENDS+= ${TEST_DEPENDS} +pre-package: + ${MAKE} test +.endif + do-test: cd ${WRKSRC} && ${SETENV} \ PYTHONPATH=${STAGEDIR}${PYTHON_SITELIBDIR} \ ${PYTHON_CMD} -m pytest -v tests/ .include diff --git a/textproc/py-jq/distinfo b/textproc/py-jq/distinfo index 068a64d9cdfc..873578994f30 100644 --- a/textproc/py-jq/distinfo +++ b/textproc/py-jq/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1644792897 -SHA256 (jq-1.2.2.tar.gz) = 86ace2c43f17b5a64a38887ede72c7b8ce2ab0bcfa81ee28ff6434e935010abe -SIZE (jq-1.2.2.tar.gz) = 72440 +TIMESTAMP = 1663888297 +SHA256 (jq-1.3.0.tar.gz) = 96b66f41a91c9794f8051cc32d8fd3206c6409693f0076b22eacb4faa0bc504f +SIZE (jq-1.3.0.tar.gz) = 2710829 SHA256 (jq-1.2.1-tests.tar.gz) = 7648084f434896eda31bb5e09a4f6d32ebb561660c95655e08346c33be9b3ece SIZE (jq-1.2.1-tests.tar.gz) = 2856 diff --git a/textproc/py-jq/files/patch-setup.py b/textproc/py-jq/files/patch-setup.py index a2237eb148a5..650d559096ed 100644 --- a/textproc/py-jq/files/patch-setup.py +++ b/textproc/py-jq/files/patch-setup.py @@ -1,24 +1,24 @@ ---- setup.py.orig 2021-05-03 13:00:29 UTC +--- setup.py.orig 2022-09-19 15:51:09 UTC +++ setup.py -@@ -43,8 +43,6 @@ class jq_build_ext(build_ext): +@@ -36,8 +36,6 @@ class jq_build_ext(build_ext): def run(self): - if not os.path.exists(dependency_path(".")): - os.makedirs(dependency_path(".")) + if not os.path.exists(_dep_build_path(".")): + os.makedirs(_dep_build_path(".")) - self._build_oniguruma() - self._build_libjq() build_ext.run(self) def _build_oniguruma(self): -@@ -103,11 +101,7 @@ jq_extension = Extension( +@@ -87,11 +85,7 @@ jq_extension = Extension( "jq", sources=["jq.c"], include_dirs=[os.path.join(jq_lib_dir, "src")], - extra_link_args=["-lm"], - extra_objects=[ - os.path.join(jq_lib_dir, ".libs/libjq.a"), - os.path.join(oniguruma_lib_install_dir, "lib/libonig.a"), - ], + extra_link_args=["-lm", "-ljq", "-lonig"], ) setup(