From nobody Sun Feb 02 09:10:44 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Ym3kr3gnBz5m5vX; Sun, 02 Feb 2025 09:10:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Ym3kr34yxz3Dj8; Sun, 02 Feb 2025 09:10:44 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738487444; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7DcH4nYdCzyhR5EcfievgdzsKJpxTfkqtnKevVklbE4=; b=ZuHqgXZQpoIRzsPsx2Wr+zm5FyXi9eM1M4nwUBKC7r8hdBLQQVd21xkQczu4ROPYApiZty nCRK+RRnEUK0USrfs6Il1uJ7ap9uDPFLBmXtG344b0niZYa1JcZVWayHmMpEJz/sUkB5wP 8F9JiWfIlcNksiUxOr3HMfr2DAs2ixp5Im9PC5RO04G3G5btKKD5axhrQQoqwq+Q18TwA5 IXO3vcOO6bBZ4ufS0IYkWgLkeIxHulLfYkVdmP9Yx4qJv32Ifvgu/BduYRvtPNylulmDAG TR/rGhkN/5e1VDgu8sLOdjH7qgcB88A3261L11MI//8ZyN0g2pC5fEPcaVaIYw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1738487444; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=7DcH4nYdCzyhR5EcfievgdzsKJpxTfkqtnKevVklbE4=; b=oi8gOLllcfqrCD+ok/JklYvU4Cam/qrUQdz2DOLU06ae+injiL+tLCZAfN+gPdUvo/10v1 TxjjN4kvLg+b1qCUiifTayWe9mseUcxfzoTALpjKC1N8WoFCyqEdXuRK/7KVg/T3tTwoSZ Rqw88l3rWuVO5Nvu90mI0ZgKzKSD/tXD6BMnWiCT9FRIcoimDs/aZb5sRuadaOZnhwpHEI zqjO3lt3UtQAm5bcdwYjBxzdhkC/PS6T5v3mMQrSZu2FK3NX/cnsD9mchutJEAGWDOnop8 OLRL1pXik1MEDeq4XFAyWFnET4+6JdAMY6WoSeDcmRiPSVRzOcOtc/2IvBWPKA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1738487444; a=rsa-sha256; cv=none; b=GztjpdTVL0x5+ps41rxS6ERfw0QuiDpMK7WZFGzqUMw11D1DIINEa+qVnt/lpjmoniIJgo Jza2JC7T4d68WDpnBpU09xZt5BxgnOBBiPd/ZcpuqjoZ/Ns+Kk559io5vSLC5m+36tuG84 ROoTw81FwI2yY59SmEqbU0eYfm+MKfQR4dB0Ojia65Hj7cUYYHnVRHiN9an+bZFHGJoa8t RD0D6pcGlQGVVWK7EuuG42WXdqv2QW82D5I+hMMxTysUHo4OmUtB21++y1xtiwtCZgjAKs 9H4dTRY+s76SazPFHCPi6g7f8/jF0FaS1STsSy/43/RDcRYkNaAopppPX7Zndw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Ym3kr2V6TzkNq; Sun, 02 Feb 2025 09:10:44 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 5129AiRw047376; Sun, 2 Feb 2025 09:10:44 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5129AiNg047373; Sun, 2 Feb 2025 09:10:44 GMT (envelope-from git) Date: Sun, 2 Feb 2025 09:10:44 GMT Message-Id: <202502020910.5129AiNg047373@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Kai Knoblich Subject: git: 20b4df7d517e - main - misc/py-spdx-tools: Update to 0.8.3 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kai X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 20b4df7d517ef0bb593e959e06422c1dee3591de Auto-Submitted: auto-generated The branch main has been updated by kai: URL: https://cgit.FreeBSD.org/ports/commit/?id=20b4df7d517ef0bb593e959e06422c1dee3591de commit 20b4df7d517ef0bb593e959e06422c1dee3591de Author: Jason E. Hale AuthorDate: 2025-02-02 08:50:09 +0000 Commit: Kai Knoblich CommitDate: 2025-02-02 08:50:09 +0000 misc/py-spdx-tools: Update to 0.8.3 * Add a workaround by pre-generating some files to avoid fs-violations in poudriere. * Remove CONFLICTS_INSTALL as the installed package of this port no longer conflicts with misc/py-spdx. Changelog since 0.7.1: https://github.com/spdx/tools-python/blob/v0.8.3/CHANGELOG.md PR: 284464 Reported by: jhale --- misc/py-spdx-tools/Makefile | 32 ++++++++++++++++++++--------- misc/py-spdx-tools/distinfo | 6 +++--- misc/py-spdx-tools/files/generate-parser.py | 9 ++++++++ 3 files changed, 34 insertions(+), 13 deletions(-) diff --git a/misc/py-spdx-tools/Makefile b/misc/py-spdx-tools/Makefile index b3fcfba595f3..94eb8e59d0d0 100644 --- a/misc/py-spdx-tools/Makefile +++ b/misc/py-spdx-tools/Makefile @@ -1,6 +1,5 @@ PORTNAME= spdx-tools -DISTVERSION= 0.7.1 -PORTREVISION= 1 +DISTVERSION= 0.8.3 CATEGORIES= misc python MASTER_SITES= PYPI PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -14,30 +13,43 @@ LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}setuptools-scm>=3.4.3:devel/py-setuptools-scm@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} - + ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} \ + ${RUN_DEPENDS} RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click>=0:devel/py-click@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}pyyaml>=0:devel/py-pyyaml@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}xmltodict>=0:devel/py-xmltodict@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}rdflib>=0:textproc/py-rdflib@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}typeguard>=2.13.3:devel/py-typeguard@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}beartype>=0:devel/py-beartype@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}uritools>=0:net/py-uritools@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}license-expression>=0:textproc/py-license-expression@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${PY_FLAVOR} + ${PYTHON_PKGNAMEPREFIX}ply>=0:devel/py-ply@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}semantic-version>=0:devel/py-semantic-version@${PY_FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tzdata>=0:devel/py-tzdata@${PY_FLAVOR} USES= python USE_PYTHON= autoplist concurrent pep517 pytest TEST_ENV= PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} LC_ALL=en_US.UTF-8 -CONFLICTS_INSTALL= py??-spdx -NO_ARCH= yes -PORTEXAMPLES= * +NO_ARCH= yes +PLIST_FILES= ${PYTHON_SITELIBDIR}/spdx_tools/spdx/parser/tagvalue/parser.out +PORTEXAMPLES= * OPTIONS_DEFINE= EXAMPLES -post-install-EXAMPLES-on: +pre-build: + ${SETENVI} PYTHONPATH=${WRKSRC}/src:${PYTHON_LIBDIR} ${PYTHON_CMD} ${FILESDIR}/generate-parser.py + +post-install: @${MKDIR} ${STAGEDIR}${EXAMPLESDIR} ${FIND} ${WRKSRC}/examples -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${EXAMPLESDIR} \; + ${INSTALL_DATA} ${WRKSRC}/src/spdx_tools/spdx/parser/tagvalue/parser.out \ + ${STAGEDIR}${PYTHON_SITELIBDIR}/spdx_tools/spdx/parser/tagvalue + +# This test requires https://github.com/RDFLib/pySHACL, which is not currently +# in the ports tree. Using PYTEST_IGNORED_TESTS doesn't seem to work in this +# case, so just delete it for now so that the other tests pass. +pre-test: + ${RM} ${WRKSRC}/tests/spdx3/validation/json_ld/test_shacl_validation.py .include diff --git a/misc/py-spdx-tools/distinfo b/misc/py-spdx-tools/distinfo index 7d8bb429eae2..30382b146207 100644 --- a/misc/py-spdx-tools/distinfo +++ b/misc/py-spdx-tools/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1683647611 -SHA256 (spdx-tools-0.7.1.tar.gz) = 975e6dbba88f105a8acb22abf53fe90f0e9d5635a2b9b1fe487781e969623b17 -SIZE (spdx-tools-0.7.1.tar.gz) = 200475 +TIMESTAMP = 1737794656 +SHA256 (spdx-tools-0.8.3.tar.gz) = 68b8f9ce2893b5216bd90b2e63f1c821c2884e4ebc4fd295ebbf1fa8b8a94b93 +SIZE (spdx-tools-0.8.3.tar.gz) = 681626 diff --git a/misc/py-spdx-tools/files/generate-parser.py b/misc/py-spdx-tools/files/generate-parser.py new file mode 100644 index 000000000000..08f9c64cc5ed --- /dev/null +++ b/misc/py-spdx-tools/files/generate-parser.py @@ -0,0 +1,9 @@ +# Pre-generate a few files to avoid fs-violations in poudriere: +# +# ${PYTHON_SITELIBDIR}/spdx_tools/spdx/parser/tagvalue/parser.out +# ${PYTHON_SITELIBDIR}/spdx_tools/spdx/parser/tagvalue/parser.py +# + +import spdx_tools.spdx.parser.tagvalue.tagvalue_parser as tvp + +tvp.Parser()