git: 86eb4911c16c - main - devel/py-setuptools_scm: Update to 6.4.2

The branch main has been updated by kai:

URL: https://cgit.FreeBSD.org/ports/commit/?id=86eb4911c16c3feb076d8f2c6c10d1561b9ae7ca

commit 86eb4911c16c3feb076d8f2c6c10d1561b9ae7ca
Author:     Kai Knoblich <kai@FreeBSD.org>
AuthorDate: 2022-02-12 10:41:02 +0000
Commit:     Kai Knoblich <kai@FreeBSD.org>
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):