diff --git a/textproc/yq/Makefile b/textproc/yq/Makefile index 2ad2df3e7348..ffe33d01ca00 100644 --- a/textproc/yq/Makefile +++ b/textproc/yq/Makefile @@ -1,39 +1,41 @@ PORTNAME= yq -DISTVERSION= 3.4.1 +DISTVERSION= 3.4.2 CATEGORIES= textproc python MASTER_SITES= PYPI MAINTAINER= yuri@FreeBSD.org COMMENT= Command-line YAML and XML processor, jq wrapper for YAML/XML documents WWW= https://kislyuk.github.io/yq/ LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE -BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=3.4.3:devel/py-setuptools-scm@${PY_FLAVOR} +BUILD_DEPENDS= ${PY_SETUPTOOLS} \ + ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=7:devel/py-setuptools-scm@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} RUN_DEPENDS= jq:textproc/jq \ ${PYTHON_PKGNAMEPREFIX}argcomplete>=1.8.1:devel/py-argcomplete@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyaml>=5.3.1:textproc/py-pyaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tomlkit>=0.11.6:textproc/py-tomlkit@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xmltodict>=0.11.0:devel/py-xmltodict@${PY_FLAVOR} TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}build>0:devel/py-build@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}coverage>0:devel/py-coverage@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}mypy>0:devel/py-mypy@${PY_FLAVOR} \ ruff:devel/ruff \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} USES= python shebangfix -USE_PYTHON= distutils noflavors autoplist +USE_PYTHON= pep517 noflavors autoplist SHEBANG_FILES= test/test.py TEST_ENV= ${MAKE_ENV} PATH=${STAGEDIR}${PREFIX}/bin:${PATH} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} CONFLICTS_INSTALL= go-yq NO_ARCH= yes do-test: # tests fail: https://github.com/mikefarah/yq/issues/2016 @cd ${WRKSRC}/test && ${SETENV} ${TEST_ENV} ./test.py .include diff --git a/textproc/yq/distinfo b/textproc/yq/distinfo index 9191d376ff87..70eefe862bce 100644 --- a/textproc/yq/distinfo +++ b/textproc/yq/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1713472108 -SHA256 (yq-3.4.1.tar.gz) = b558dab6f15c03e24a1c448789500b20d6f307ee9ca4c9361387f3658163000d -SIZE (yq-3.4.1.tar.gz) = 32876 +TIMESTAMP = 1714193103 +SHA256 (yq-3.4.2.tar.gz) = f916408e834e96f390ef82a36bfcbf24a555ae5a2fcdaef94a2ed5d260d161ef +SIZE (yq-3.4.2.tar.gz) = 33154 diff --git a/textproc/yq/files/patch-setup.py b/textproc/yq/files/patch-setup.py new file mode 100644 index 000000000000..15298ecf028e --- /dev/null +++ b/textproc/yq/files/patch-setup.py @@ -0,0 +1,11 @@ +--- setup.py.orig 2024-04-27 04:49:23 UTC ++++ setup.py +@@ -15,7 +15,7 @@ setup( + use_scm_version={ + "write_to": "yq/version.py", + }, +- setup_requires=["setuptools_scm >= 7, <8"], ++ setup_requires=["setuptools_scm >= 7"], + install_requires=[ + "PyYAML >= 5.3.1", + "xmltodict >= 0.11.0",