From nobody Tue Oct 24 22:00:23 2023 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 4SFQwS1SyHz4xZHC; Tue, 24 Oct 2023 22:00:24 +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 4SFQwS0zDhz3CHl; Tue, 24 Oct 2023 22:00:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698184824; 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=I7x7XnuDWrOb6xIdaS74mMW/zxryRCmYY+ocRZdu7CI=; b=bHKfDL14t10zuQt/HvCppx1GMmkmgKLHIQP6BAj3ORNqXHMvY9j3ohyEGAS8NfAtKZoUc4 nZH31PunDC3XBTdww0k2sY0wbQFWwV/4wzrB0PY8PoGMuvSOdOMe2oX+3us6yLwfDbhd/a ewQUYNGU6x+6JhOltJNq9Uf2KViwzbn0DuUXT8bpykva6MJTucMYIl4apg6p4QS08JWZV0 FkPQtonvLkqi+wocgHOU1fHDLVRV84Ld4jNJ9f1npWc75d0DFw+NQI2RQmbghXqMmCEzkj iAFdFWsfF/Sp5bmMh/VMJvA0Ml2cp0ATDDCKVnBPp9vFJxhBrgsEi/7IYQNswQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698184824; a=rsa-sha256; cv=none; b=aKjrdvblyW0Umvqc4XXtkcgfT8lCbEB9/VKJJHt17MonzrmcFqlYPJol+AK3QbCZDDaXx4 d+07OwOp4yuTMCzP5qpIdYNnpjHR0tEz5UA19guffAz32iz22vYaQ8jLnryDmu7MshjVPU Rekg+pIdnbnjK0t+0hYWg+hL96iDW8x53FYB9zbcy4z7O3kuobmAFsIU2tf+GI7f+IuE/6 FQbZN2RT5GbMNP95MuUpcYddOZoyJeS0MbnPM94m5hZzjqsoBCc2Nnd02OTFnPx5+GPMhn Vo2CAOdlUuaM8HzgEDrxJhAI0lims90X+VT8le/ZVtDBZy9qMUijye0JMnMwlw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698184824; 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=I7x7XnuDWrOb6xIdaS74mMW/zxryRCmYY+ocRZdu7CI=; b=qg4pTVPaus8vOHjFO3MlV7er0k82j9wQrnjOmPmcjYtW8UY3Z46ItsLjvU8ZFyxKaVuQpe jqCGJWhKj20SkPJ13FIeeHe2TIY1gRyeOMUSbF9kiTe428s5twtRJqg0yflIARNefOE0LB IkcOyB9D1z+azPyES8Rgx9tLVoYHrKpCLlXI2X/zZVy3c/x2bmnIw/ZXHfIdu9c9HNPy3S uiyb8GkY5bpbIvOT62gWfwR+iS9/uqZx6U6RWAOG1T7rMlpkgeZMs7yvRFnnbZvns3ZEwF NlLKr15sE5wacbBiSZTVmnzdqd3jlDtFbnFhl74Oce5VHgRJN2B+HS4PY2xMSg== 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 4SFQwR73cZzfWH; Tue, 24 Oct 2023 22:00:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 39OM0NkW034275; Tue, 24 Oct 2023 22:00:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39OM0NP5034272; Tue, 24 Oct 2023 22:00:23 GMT (envelope-from git) Date: Tue, 24 Oct 2023 22:00:23 GMT Message-Id: <202310242200.39OM0NP5034272@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: e33030af683d - main - textproc/py-jq: update =?utf-8?Q?=E2=86=92?= 1.6.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: e33030af683dea37b67fc3c4fc89aaa81e0b9535 Auto-Submitted: auto-generated The branch main has been updated by mandree: URL: https://cgit.FreeBSD.org/ports/commit/?id=e33030af683dea37b67fc3c4fc89aaa81e0b9535 commit e33030af683dea37b67fc3c4fc89aaa81e0b9535 Author: Matthias Andree AuthorDate: 2023-10-24 21:58:57 +0000 Commit: Matthias Andree CommitDate: 2023-10-24 22:00:17 +0000 textproc/py-jq: update → 1.6.0 https://github.com/mwilliamson/jq.py/blob/1.6.0/CHANGELOG.rst#changelog --- textproc/py-jq/Makefile | 15 ++++++--------- textproc/py-jq/distinfo | 8 +++----- textproc/py-jq/files/patch-setup.py | 24 ------------------------ textproc/py-jq/files/tox.ini | 15 +++++++++++++++ 4 files changed, 24 insertions(+), 38 deletions(-) diff --git a/textproc/py-jq/Makefile b/textproc/py-jq/Makefile index e7d812b6a0c0..ebfcc3da58c9 100644 --- a/textproc/py-jq/Makefile +++ b/textproc/py-jq/Makefile @@ -1,9 +1,9 @@ PORTNAME= jq -PORTVERSION= 1.5.0 +PORTVERSION= 1.6.0 CATEGORIES= textproc python MASTER_SITES= PYPI LOCAL/mandree:mandree PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} jq-1.2.1-tests${EXTRACT_SUFX}:mandree +DISTFILES= ${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX} MAINTAINER= mandree@FreeBSD.org COMMENT= jq.py: a lightweight and flexible JSON processor @@ -21,17 +21,11 @@ TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}certifi>=0:security/py-certifi@${PY_FLAVOR} ${PYTHON_PKGNAMEPREFIX}requests>0:www/py-requests@${PY_FLAVOR} \ ${PY_SETUPTOOLS} \ ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} +MAKE_ENV+= JQPY_USE_SYSTEM_LIBS=1 USES= localbase python USE_PYTHON= autoplist distutils -post-extract: - # move tests into place - ${MV} ${WRKDIR}/jq-1.2.1/* ${WRKSRC} - -post-patch: - ${REINPLACE_CMD} -e 's/\$$end/end of file/' ${WRKSRC}/tests/*.py - post-install: ${STRIP_CMD} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}/jq*.so @@ -41,6 +35,9 @@ pre-package: ${MAKE} test .endif +pre-test: + ${CP} ${FILESDIR}/tox.ini ${WRKSRC} + do-test: cd ${WRKSRC} && ${SETENV} \ PYTHONPATH=${STAGEDIR}${PYTHON_SITELIBDIR} \ diff --git a/textproc/py-jq/distinfo b/textproc/py-jq/distinfo index ce5322805a70..07e6bc57f943 100644 --- a/textproc/py-jq/distinfo +++ b/textproc/py-jq/distinfo @@ -1,5 +1,3 @@ -TIMESTAMP = 1694367159 -SHA256 (jq-1.5.0.tar.gz) = 47695d97c300b6a5c36731d9cab12f6bf1cee35f01b3374063b87f868f2131d1 -SIZE (jq-1.5.0.tar.gz) = 2716575 -SHA256 (jq-1.2.1-tests.tar.gz) = 7648084f434896eda31bb5e09a4f6d32ebb561660c95655e08346c33be9b3ece -SIZE (jq-1.2.1-tests.tar.gz) = 2856 +TIMESTAMP = 1697574722 +SHA256 (jq-1.6.0.tar.gz) = c7711f0c913a826a00990736efa6ffc285f8ef433414516bb14b7df971d6c1ea +SIZE (jq-1.6.0.tar.gz) = 2913373 diff --git a/textproc/py-jq/files/patch-setup.py b/textproc/py-jq/files/patch-setup.py deleted file mode 100644 index 650d559096ed..000000000000 --- a/textproc/py-jq/files/patch-setup.py +++ /dev/null @@ -1,24 +0,0 @@ ---- setup.py.orig 2022-09-19 15:51:09 UTC -+++ setup.py -@@ -36,8 +36,6 @@ class jq_build_ext(build_ext): - def run(self): - 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): -@@ -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( diff --git a/textproc/py-jq/files/tox.ini b/textproc/py-jq/files/tox.ini new file mode 100644 index 000000000000..5295e5901382 --- /dev/null +++ b/textproc/py-jq/files/tox.ini @@ -0,0 +1,15 @@ +# https://raw.githubusercontent.com/mwilliamson/jq.py/1.6.0/tox.ini +# https://github.com/mwilliamson/jq.py/issues/96 + +[tox] +envlist = py35,py36,py37,py38,py39,py310,py311,pypy3 +isolated_build = True +[testenv] +changedir = {envtmpdir} +deps=-r{toxinidir}/test-requirements.txt +commands= + py.test {toxinidir}/tests +passenv = JQPY_USE_SYSTEM_LIBS + +[pytest] +python_files = *_tests.py