From nobody Sat Feb 12 10:44:16 2022 X-Original-To: dev-commits-ports-all@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 43A5E194B9E0; Sat, 12 Feb 2022 10:44:17 +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 4JwnD112QKz3NG6; Sat, 12 Feb 2022 10:44:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644662657; 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=SACVveIBY/GS9AfN4R1kFeQhjhATIQ3dQiXv2WsPkHA=; b=exaPzkozHpErxn8Yaz8VVHg+SuTOgM62jV37oiIxmvsHJmuMzYdHSFJ5t3uEEpQZZed2BM l0yWLxJa4ah3GaoaOOcTTklxU5qzlNFWaFaytgB3MnnMXVxT4VJWHYhq2P/pTjC7MH5uhb +JtETeCxZ4ouwu/X3orDi37Z8qC524pFlYJuChJEnfS3rqfdLeep8jSyFLOdiaXceEnmy9 vEYAfG2aI2Vzy8TkrW485PWr8ycAS+4PwJy33jJham60tadRB4AmIE0PfjLd/hZNyn6wk4 6d0o3NZI0RHF3COgOXLgQH+bwXEQ8QzFwjLq+TeemtC3D4+q19COxKkcBRoDSg== 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 0419625EF5; Sat, 12 Feb 2022 10:44:17 +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 21CAiG5h060207; Sat, 12 Feb 2022 10:44:16 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 21CAiGIA060206; Sat, 12 Feb 2022 10:44:16 GMT (envelope-from git) Date: Sat, 12 Feb 2022 10:44:16 GMT Message-Id: <202202121044.21CAiGIA060206@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: 86eb4911c16c - main - devel/py-setuptools_scm: Update to 6.4.2 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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: 86eb4911c16c3feb076d8f2c6c10d1561b9ae7ca Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1644662657; 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=SACVveIBY/GS9AfN4R1kFeQhjhATIQ3dQiXv2WsPkHA=; b=Pw2t4hd+wfLY8CbvSHIxvztXpHvlGPzIq/AFOHxQ/SsiHa7J+Ucw5xojulvdWNX/AUfUr2 nDJZKaT8x8Q2/xzpEvSDK/gt7uoSV3aw5f8SP8QHeTo6uFYbaRXsFpSvuDFqeJh/6h9TTM n7TnLbfrscy/w6+xU+kPjWoLyx0EKg0SUXHGCAH46Scx3J07FWi/xv7+AbG7iBYc3DXxOr PvryvnZzJLWVczTL3+T7s+gXzKBo7R+RQ2Zae6qIAlu5I1Fpu3+F/su9YWLgU+R2S/IPQ5 2tDELAGLrBlWCTfOSvvR6th4Nr+DEQRJSetQ6HdeY/D2gu8/BNS/HV4rAatX8Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1644662657; a=rsa-sha256; cv=none; b=Gc7WEkElY7KrCQ4O6FgF2QbOAgQbH0XyU20o/Z+cHX+iszAfGNrbVVqEUHEZ4rnjBmgEb/ TKihPvWgZmCFgFVm7x50xyiiCmsvDXr0w/2Dgk/ah9qrvwopsucbdJBWMLBiMU2TMUrX+g 1r+2JKPd9FAduZb/4lk6qpRodN3ai92kOH0CcYmunETswU9CDGCxbpWPHNrCdtMekqvCAX /+zIwPwM0+TG8i3XUinrB3i1IdKPnqXp1MP53c8QNBc0KTJcOLpugIVdnKz0t5Ymefyv6X USI/7ohX1aO6uUOgxM/dkUYjCZjIDRhfV2M2d+B8D4Mr9DlKh/UGVN/3k886VQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by kai: URL: https://cgit.FreeBSD.org/ports/commit/?id=86eb4911c16c3feb076d8f2c6c10d1561b9ae7ca commit 86eb4911c16c3feb076d8f2c6c10d1561b9ae7ca Author: Kai Knoblich AuthorDate: 2022-02-12 10:41:02 +0000 Commit: Kai Knoblich CommitDate: 2022-02-12 10:41:02 +0000 devel/py-setuptools_scm: Update to 6.4.2 * Fold the TOML option because its dependency is no longer an optional requirement as noted in "setup.{py,cfg}". This should also fix some cases with build errors where the TOML option was disabled. [1] Changelog since 6.3.2: https://github.com/pypa/setuptools_scm/blob/v6.4.2/CHANGELOG.rst PR: 259797 [1], 261698 [1] MFH: No (feature release) --- devel/py-setuptools_scm/Makefile | 18 +++++++++--------- devel/py-setuptools_scm/distinfo | 6 +++--- .../files/patch-testing_test__integration.py | 13 +++++++++++++ 3 files changed, 25 insertions(+), 12 deletions(-) diff --git a/devel/py-setuptools_scm/Makefile b/devel/py-setuptools_scm/Makefile index ed38105484b9..65e78d9290b9 100644 --- a/devel/py-setuptools_scm/Makefile +++ b/devel/py-setuptools_scm/Makefile @@ -1,6 +1,5 @@ PORTNAME= setuptools_scm -PORTVERSION= 6.3.2 -PORTREVISION= 1 +PORTVERSION= 6.4.2 CATEGORIES= devel python MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -12,8 +11,10 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}packaging>=20.0:devel/py-packaging@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}tomli>=1.0.0:textproc/py-tomli@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}packaging>=20.0:devel/py-packaging@${PY_FLAVOR} \ ${PYTHON_PKGNAMEPREFIX}tomli>=1.0.0:textproc/py-tomli@${PY_FLAVOR} -RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}packaging>=20.0:devel/py-packaging@${PY_FLAVOR} TEST_DEPENDS= git:devel/git \ ${PY_MERCURIAL} \ ${PYTHON_PKGNAMEPREFIX}pip>=0:devel/py-pip@${PY_FLAVOR} \ @@ -28,16 +29,15 @@ TEST_ENV= _PYTEST_SESSION=yes NO_ARCH= yes -OPTIONS_DEFINE= TOML -OPTIONS_DEFAULT= TOML - -TOML_DESC= Support PEP 517/518 (Keep this enabled to avoid build errors) -TOML_RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}tomli>=1.0.0:textproc/py-tomli@${PY_FLAVOR} - # Skip integration tests that require a more recent version of py-virtualenv post-extract: @${MV} ${WRKSRC}/testing/test_setuptools_support.py ${WRKSRC}/testing/test_setuptools_support.py.dist +post-patch: + @${REINPLACE_CMD} -e 's|%%PYTHON_CMD%%|${PYTHON_CMD}|' ${WRKSRC}/testing/test_integration.py + +# Note: The test suite requires at least py-pytest >= 6.2.0 due changes to the +# "monkeypatch" functionality. Tests are fine with py-pytest 7.0.0. do-test: @cd ${WRKSRC} && ${SETENV} ${TEST_ENV} ${PYTHON_CMD} -m pytest -v -rs diff --git a/devel/py-setuptools_scm/distinfo b/devel/py-setuptools_scm/distinfo index ebca578164e8..7dd88dc6f785 100644 --- a/devel/py-setuptools_scm/distinfo +++ b/devel/py-setuptools_scm/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1631813313 -SHA256 (setuptools_scm-6.3.2.tar.gz) = a49aa8081eeb3514eb9728fa5040f2eaa962d6c6f4ec9c32f6c1fba88f88a0f2 -SIZE (setuptools_scm-6.3.2.tar.gz) = 57207 +TIMESTAMP = 1644388030 +SHA256 (setuptools_scm-6.4.2.tar.gz) = 6833ac65c6ed9711a4d5d2266f8024cfa07c533a0e55f4c12f6eff280a5a9e30 +SIZE (setuptools_scm-6.4.2.tar.gz) = 61305 diff --git a/devel/py-setuptools_scm/files/patch-testing_test__integration.py b/devel/py-setuptools_scm/files/patch-testing_test__integration.py new file mode 100644 index 000000000000..ea66069479a8 --- /dev/null +++ b/devel/py-setuptools_scm/files/patch-testing_test__integration.py @@ -0,0 +1,13 @@ +Avoid hardcoded Python binary. + +--- testing/test_integration.py.orig 2022-02-10 17:16:34 UTC ++++ testing/test_integration.py +@@ -119,7 +119,7 @@ def test_pretend_version_accepts_bad_string(monkeypatc + monkeypatch.setenv(PRETEND_KEY, "dummy") + wd.write("setup.py", SETUP_PY_PLAIN) + assert wd.get_version(write_to="test.py") == "dummy" +- assert wd("python setup.py --version") == "0.0.0" ++ assert wd("%%PYTHON_CMD%% setup.py --version") == "0.0.0" + + + def test_own_setup_fails_on_old_python(monkeypatch):