git: b874018c2da0 - main - devel/py-virtualenv: Update to 20.26.0

From: Nicola Vitale <nivit_at_FreeBSD.org>
Date: Fri, 26 Apr 2024 13:10:12 UTC
The branch main has been updated by nivit:

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

commit b874018c2da0e560ec51c27cad832a46b6738f55
Author:     Nicola Vitale <nivit@FreeBSD.org>
AuthorDate: 2024-04-26 13:00:19 +0000
Commit:     Nicola Vitale <nivit@FreeBSD.org>
CommitDate: 2024-04-26 13:09:53 +0000

    devel/py-virtualenv: Update to 20.26.0
    
    - Add a pre-test stage that adds a [tool.setuptools_scm] section to
      project.toml, so that tests can detect the version.
      Otherwise 5 tests fail with an error similar to
    
    ________________________________________________________________________________________________________________________ test_fail_no_traceback ________________________________________________________________________________________________________________________
    
    raise_on_session_done = <function raise_on_session_done.<locals>._func at 0x3f63e7392c10>, tmp_path = PosixPath(/tmp/pytest-of-root/pytest-5/test_fail_no_traceback0), capsys = <_pytest.capture.CaptureFixture object at 0x3f63e5c0aca0>
    
        def test_fail_no_traceback(raise_on_session_done, tmp_path, capsys):
            raise_on_session_done(ProcessCallFailedError(code=2, out="out\n", err="err\n", cmd=["something"]))
            with pytest.raises(SystemExit) as context:
                run_with_catch([str(tmp_path)])
            assert context.value.code == 2
            out, err = capsys.readouterr()
            assert out == f"subprocess call failed for [{something!r}] with code 2\nout\nSystemExit: 2\n"
    >       assert err == "err\n"
    E       AssertionError: assert  ... nerrn == errn
    E         +                     WARNING  pyproject.toml does not contain a setuptools.py:119
    E         +                              tool.setuptools_scm section
    E           err
    
    tests/unit/config/test___main__.py:52: AssertionError
    
    See also https://github.com/pypa/setuptools_scm/issues/1011
    
    Release changes:        https://github.com/pypa/virtualenv/releases/tag/20.26.0
    Reported by:    Bernát Gábor <notifications@github.com>
---
 devel/py-virtualenv/Makefile | 16 ++++++++++++++--
 devel/py-virtualenv/distinfo |  6 +++---
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/devel/py-virtualenv/Makefile b/devel/py-virtualenv/Makefile
index f40c6ffd0f0c..f93744eb6e66 100644
--- a/devel/py-virtualenv/Makefile
+++ b/devel/py-virtualenv/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	virtualenv
-PORTVERSION=	20.25.3
+PORTVERSION=	20.26.0
 CATEGORIES=	devel python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
@@ -15,7 +15,7 @@ BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}distlib>=0.3.7:devel/py-distlib@${PY_FLAVO
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}distlib>=0.3.7:devel/py-distlib@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}filelock>=3.12.2:sysutils/py-filelock@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}platformdirs>=3.9.1:devel/py-platformdirs@${PY_FLAVOR}
-# tests: 296 passed, 26 skipped
+# tests: 299 passed, 27 skipped
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}covdefaults>=2.3:devel/py-covdefaults@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}coverage>=7.3.2:devel/py-coverage@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}coverage_enable_subprocess>=1.0:devel/py-coverage_enable_subprocess@${PY_FLAVOR} \
@@ -26,6 +26,7 @@ TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}covdefaults>=2.3:devel/py-covdefaults@${PY_
 		${PYTHON_PKGNAMEPREFIX}pytest-randomly>=3.12:devel/py-pytest-randomly@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-timeout>=2.1.0:devel/py-pytest-timeout@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}setuptools>=63:devel/py-setuptools@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}setuptools-scm>=8.0.4:devel/py-setuptools-scm@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}time-machine>=2.10.0:devel/py-time-machine@${PY_FLAVOR}
 
 USES=		cpe python
@@ -72,8 +73,19 @@ post-patch:
 	-e 's,%%PYTHON_VER%%,${PYTHON_VER},1' \
 	${WRKSRC}/docs/conf.py
 
+# Fix a few tests that fail with the error:
+#
+# E       AssertionError: assert  ... nerrn == errn
+# E         +                     WARNING  pyproject.toml does not contain a setuptools.py:119
+# E         +                              tool.setuptools_scm section
+#
+# See https://github.com/pypa/setuptools_scm/issues/1011
+pre-test:
+	@${PRINTF} "\n[tool.setuptools_scm]\nfallback_version = \"${PORTVERSION}\"" >> ${WRKSRC}/pyproject.toml
+
 post-install-DOCS-on:
 	${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} -d ${WRKDIR} -b html -n ${WRKSRC}/docs ${STAGEDIR}${DOCSDIR}
 	${LOCALBASE}/bin/sphinx-build-${PYTHON_VER} -d ${WRKDIR} -b man -n ${WRKSRC}/docs ${STAGEDIR}${PREFIX}/share/man/man1
 
+
 .include <bsd.port.mk>
diff --git a/devel/py-virtualenv/distinfo b/devel/py-virtualenv/distinfo
index 7471a62e6627..9aa0f6b663be 100644
--- a/devel/py-virtualenv/distinfo
+++ b/devel/py-virtualenv/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1713456785
-SHA256 (pypa-virtualenv-20.25.3_GH0.tar.gz) = 6e3fa10473b5389a1a2139aa25eb82d743f2db4fc3231d488dab3f24aa30fce3
-SIZE (pypa-virtualenv-20.25.3_GH0.tar.gz) = 7329139
+TIMESTAMP = 1714057633
+SHA256 (pypa-virtualenv-20.26.0_GH0.tar.gz) = 52d3892ce26a0682fa0d3f51e37727398a909449dc211b2abbf5e5849b9223b6
+SIZE (pypa-virtualenv-20.26.0_GH0.tar.gz) = 7329467