From nobody Fri Sep 23 20:06:23 2022 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 4MZ37g6q7Vz4cpSx; Fri, 23 Sep 2022 20:06:23 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4MZ37g6Kcwz3TMg; Fri, 23 Sep 2022 20:06:23 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663963583; 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=9/YwhetQXm7eqH20vbFQlzQvbDF38ahYC4LSkpuf8No=; b=rYpcpBZr3S7NRXF3phWQ/jy9tRh8nGP8PhU/efOpkNn73sUEuI9Mdl73YYo2PrhwPiJ9/z 1YS7K3YEtWf/o2YfBFD/FWHOCTSU3Bs8i/vba7Nrj5adM4El/mwgXN/xoaA1ana1J4eZ03 NkVMN5Y5TnsPNEwbnyayHGd/Qfh+Bo5pV5jDywWwXKHjvrnhL/d2SeYilGfqFfzET7UyeO BV//eiLq6VSnOiYzJvBcPtzlnoRJf3VenVf8wm83EeWpW33l3cgm1wItz0YdBKJbYg+ZZW ZvVfsT5oaO1KQBFIFVGdTMK7WEqoR7gxUdkADCJ8qA81pFoERbCObmH5VWIjBQ== 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 4MZ37g5BR6zqyS; Fri, 23 Sep 2022 20:06:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 28NK6NwV022038; Fri, 23 Sep 2022 20:06:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 28NK6NMv022037; Fri, 23 Sep 2022 20:06:23 GMT (envelope-from git) Date: Fri, 23 Sep 2022 20:06:23 GMT Message-Id: <202209232006.28NK6NMv022037@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Matthias Andree Subject: git: be626dd64568 - main - textproc/py-jq: update to 1.3.0 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: mandree X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: be626dd64568a84be0234dc44f6acace02d8fca4 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1663963583; 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=9/YwhetQXm7eqH20vbFQlzQvbDF38ahYC4LSkpuf8No=; b=Tn5m5Az8DHbGrMxL3zqUF57qB+tiP57rAXc4l//ALSAyHCXWs9Bmu4H5hw3v1r/beyI44l DsniL7mQOFnMHzjQdV8G4PnGkbKjm9wj3zhuclPx83XmnWbYVZdUlaZR5399hZb5iPfrqh 52Bw/dmEitDb+Nbf2DsPBWZTnScu+Sc7hwWtf3pUouh0Z5ITx01lFjyD0T0jLHrHJu1s2N 7orMgIxwIlrvyqYUXEIMhqt8wv5lQCFVa1p4i9TvgpkqyAUQaw+CoCfKVHwpFl9r+/6kj/ hyTVOhypQOgL7yzzDYcWHvodgtOV9WL9fSgO5Z211GUuitUSstNj2xrVLSvEdQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1663963583; a=rsa-sha256; cv=none; b=uQPdz51YqC0yXv+lUFsZGKeh9k8qb/8hfg6HN1iyUTND9oeNimScOKclEZ2Ia1WR5MVFmI eXzo26WW2gAdhJ7fYE5pYHuaJjf9PfnI66YnyD1lESl5ZWA3MWPc6xEJ/saktMGxq7crXw iIQrCuYUwGvz6Y5ZMwm/Dw+sOGw+JUqzcLz5Vfc9dKVxsDevwNUYtrob4uUWe02DpXp61o hsCn2kROROf80RQ9p5TpB66n6OpKC2afC6U4c1ZxWl7tUaGKcsiE1k4MUC4JSgI8NZaXG2 YbtxJ7Q3xcEzeMJhG5N6PN7B3qvIk+2rcIGUeINm606FZlfz+pMs8CUgBkhkLA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=be626dd64568a84be0234dc44f6acace02d8fca4 commit be626dd64568a84be0234dc44f6acace02d8fca4 Author: Matthias Andree AuthorDate: 2022-09-23 20:04:40 +0000 Commit: Matthias Andree CommitDate: 2022-09-23 20:06:21 +0000 textproc/py-jq: update to 1.3.0 Supports Python 3.11. It would include oniguruma and jq libs in its sources, but let's continue using our separate ports for now. Add support for forcing self-tests under poudriere, masked by a variable that I can set from /usr/local/etc/poudriere.d/make.conf. --- textproc/py-jq/Makefile | 12 +++++++++--- textproc/py-jq/distinfo | 6 +++--- textproc/py-jq/files/patch-setup.py | 10 +++++----- 3 files changed, 17 insertions(+), 11 deletions(-) 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,5 +1,5 @@ PORTNAME= jq -PORTVERSION= 1.2.2 +PORTVERSION= 1.3.0 CATEGORIES= textproc python MASTER_SITES= CHEESESHOP LOCAL/mandree:mandree PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -22,16 +22,22 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi@${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} \ 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,15 +1,15 @@ ---- 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")],