From nobody Tue Nov 22 17:03:57 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 4NGrFT4mLjz4j5MP; Tue, 22 Nov 2022 17:03:57 +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 4NGrFT4Dbpz3Ptw; Tue, 22 Nov 2022 17:03:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669136637; 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=ZvJMKaZFHna7UxeTiQ3PrjS1WpEULSOUD3/fWkd2khY=; b=te9WS9FdSZ0YSnRwiF/Ou5/qB9ydZY3MpEQYHQ1LQeCPbcymAfJ8oT6eIaFORXxfN5vNYa x4ERg50fzooegs8yDtnFNsvDILomlKttq0TxJPraZhKXfd1qIrvD+GS8kaZmygaJvcyy24 O1I4AZVjuGEuzsdJLSprLwBkrtsj5lzPzLRaXwnYW6ty6+P0ukEPVU4/HDLQaLWq9UscGX 78CjjucUWeuui53HAvpB+kkHPpElyhU5E+j2UH1XdZ9W+4yW2uzpXgfI5Y3LCTKObD8Qxk eO+lcGwJLyU9xkGRBc8gHHyOpPTxcey8DtP5qaxRwWwdeGLU6Ji19AnzGRg8wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1669136637; 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=ZvJMKaZFHna7UxeTiQ3PrjS1WpEULSOUD3/fWkd2khY=; b=xOrrWC3gYL6x5VZd3AD4c3Amiimbq6mhMwuDLeeQrwVTbUsFgXwhqkVNjYuTLAddUQNRgC f456+zef9SyOKXLEEvDuR0e/Jts6bQSzGLejThqgvfUUPW9gWoBEan0kC9WpVPlwBuq1nf Vc5mny5JS1c5++2LMnRT8OwJUGS6iJVjtsdJhxKSeV1iS1KpVH6QnVPMcA+WQJK+Fs6KHK IVN4o6/gPNbd6jTUJjoS6APtUQGjhULuPvps7IlrPUAfm3YH+xlc6vxg6Vhl2wY7VoVipD HUSmaFBFP6BqhILS28Hbz4+kHK7SFCFoPpZsDBrSvnkQscNKTA+H+5E00oWogA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1669136637; a=rsa-sha256; cv=none; b=Tvo4TBdxrURTMCSS9ClHlSfomXlJRBHiVWWxKeWPHbRen7ruE+3+DbLkAWFZdf7q/o66Md lTZCGKkMi/ph1xXYQ6DCMm4z/VoU2jZOocG0dB1j3U+9/P/7/YDucobXWdQZU82yv2R3c5 PKf+0j66oXfWpJFPC4Z4Cs29wceqibhiFsroMgW0fatOFX+gkJM/RDlngD3ROnXgAcniAM Q7bsxs4EpAjJB5VK/QHN4oFwBA+rgIZvL1BNAvTdJXzW1d7UT91N5+8XmxVLHX3UdtAzpi C8UdmHWIDM6r0xQ2GimAf4mVLWgweTp/+k2Lxj7HovgEYBlAN+qlWh4OgqCzQA== 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 4NGrFT3JCGzqVw; Tue, 22 Nov 2022 17:03:57 +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 2AMH3vCm097573; Tue, 22 Nov 2022 17:03:57 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2AMH3vDh097572; Tue, 22 Nov 2022 17:03:57 GMT (envelope-from git) Date: Tue, 22 Nov 2022 17:03:57 GMT Message-Id: <202211221703.2AMH3vDh097572@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Nicola Vitale Subject: git: e7693e387ca0 - main - devel/py-virtualenv: Update to 20.16.7 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: nivit X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e7693e387ca0224d30dc2bd7ec86205961d4a8c5 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by nivit: URL: https://cgit.FreeBSD.org/ports/commit/?id=e7693e387ca0224d30dc2bd7ec86205961d4a8c5 commit e7693e387ca0224d30dc2bd7ec86205961d4a8c5 Author: Nicola Vitale AuthorDate: 2022-11-22 16:58:56 +0000 Commit: Nicola Vitale CommitDate: 2022-11-22 16:58:56 +0000 devel/py-virtualenv: Update to 20.16.7 - Update (BUILD|RUN|TEST)_DEPENDS list - Update patch for docs/conf.pyp file - Use pytest for testing - Set the environment variable SETUPTOOLS_SCM_PRETEND_VERSION to fix the exception: LookupError: setuptools-scm was unable to detect version - Disable QA_depends_blacklist when executing the test target, because virtualenv also requires python2 executable for some tests - Set the test environment variable PYTHONPATH, so pytest can find the virtualenv library - Force setuptools to create a temporary egg_info in build/lib during the build stage, so that sphinx can then create docs. Exception occurred: File "/usr/local/poudriere/ports/default/devel/py-virtualenv/work-py39/virtualenv-20.16.7/build/lib/ virtualenv/run/plugin/discovery.py", line 20, in get_discover default=next(iter(choices)), StopIteration (raised only when virtualenv is not already installed in the system) - Add devel/py-importlib-metadata to RUN_DEPENDS when using python3.7 - Reorder variables in Makefile Port tested with all versions of Python currently supported. Changelog: https://github.com/pypa/virtualenv/releases/tag/20.16.7 --- devel/py-virtualenv/Makefile | 75 +++++++++++++++++++--------- devel/py-virtualenv/distinfo | 6 +-- devel/py-virtualenv/files/patch-docs_conf.py | 18 +++---- 3 files changed, 64 insertions(+), 35 deletions(-) diff --git a/devel/py-virtualenv/Makefile b/devel/py-virtualenv/Makefile index 044b6a84094f..3c13b8eebd54 100644 --- a/devel/py-virtualenv/Makefile +++ b/devel/py-virtualenv/Makefile @@ -1,5 +1,5 @@ PORTNAME= virtualenv -PORTVERSION= 16.7.5 +PORTVERSION= 20.16.7 PORTREVISION= 0 CATEGORIES= devel python PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} @@ -10,39 +10,68 @@ WWW= https://virtualenv.pypa.io LICENSE= MIT -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} - -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=1.8.0,1:textproc/py-sphinx@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}towncrier>0:textproc/py-towncrier@${PY_FLAVOR} -DOCS_BINARY_ALIAS= towncrier=towncrier-${PYTHON_VER} -DOCS_PORTDOCS= * -DOCS_VARS= PYDISTUTILS_BUILD_TARGET="build build_sphinx" - -# Required by towncrier/click when Python < 3.7 -# see https://click.palletsprojects.com/en/7.x/python3/ -# Documentation is in English, so... -MAKE_ENV= LANG=en_US.UTF-8 LC_ALL=en_US.UTF-8 +BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}distlib>=0.3.6:devel/py-distlib@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pip>=0:devel/py-pip@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}setuptools_scm>=0:devel/py-setuptools_scm@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} +RUN_DEPENDS= ${PYTHON_PKGNAMEPREFIX}distlib>=0.3.6:devel/py-distlib@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}filelock>=3.4.1:sysutils/py-filelock@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}platformdirs>=2.4:devel/py-platformdirs@${PY_FLAVOR} +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}coverage_enable_subprocess>=1.0:devel/py-coverage_enable_subprocess@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}flaky>=3.7.0:devel/py-flaky@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}packaging>=21.3:devel/py-packaging@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-env>=0.6.2:devel/py-pytest-env@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-freezegun>=0.4.2:devel/py-pytest-freezegun@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-mock>0:devel/py-pytest-mock@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-randomly>=3.10.3:devel/py-pytest-randomly@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}pytest-timeout>=2.1.0:devel/py-pytest-timeout@${PY_FLAVOR} +USES= cpe python:3.6+ +USE_GITHUB= yes GH_ACCOUNT= pypa +USE_PYTHON= autoplist concurrent distutils pytest + +# Fix the LookupError: setuptools-scm was unable to detect version (build target) +MAKE_ENV= SETUPTOOLS_SCM_PRETEND_VERSION="${PORTVERSION}" +.if make(test) +TEST_DEPENDS+= python2:lang/python2 +TEST_ENV= PYTHONIOENCODING=utf-8 \ + PYTHONPATH="${STAGEDIR}${PYTHON_SITELIBDIR}" +QA_ENV= IGNORE_QA_depends_blacklist=yes # we also need lang/python2 to pass some tests +.endif NO_ARCH= yes OPTIONS_DEFINE= DOCS -PYDISTUTILS_BUILDARGS= -c ${WRKSRC}/docs - -USES= cpe python:3.6+ -USE_GITHUB= yes -USE_PYTHON= autoplist concurrent distutils +DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}click-default-group>0:devel/py-click-default-group@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}filelock>0:sysutils/py-filelock@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}platformdirs>0:devel/py-platformdirs@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}proselint>0:devel/py-proselint@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sphinx-argparse>0:textproc/py-sphinx-argparse@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sphinx>=1.8.0,1:textproc/py-sphinx@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}towncrier>=22.8.0:textproc/py-towncrier@${PY_FLAVOR} +DOCS_BINARY_ALIAS= towncrier=towncrier-${PYTHON_VER} +DOCS_PORTDOCS= * +# Note: we install a temporary egg_info so that virtualenv can discover its stuff, +# while sphinx builds docs. Otherwise an Exception occurs: +# +# File "/build/lib/virtualenv/run/plugin/discovery.py", line 20, in get_discover +# default=next(iter(choices)), +# StopIteration +# +DOCS_VARS= PYDISTUTILS_BUILD_TARGET="build install_egg_info --install-dir build/lib build_sphinx" post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/build/sphinx/html && \ ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "! -name .buildinfo -or -name objects.inv") -regression-test: build - @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test +.include + +.if "${PYTHON_VER}" == "3.7" +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}importlib-metadata>=4.8.1:devel/py-importlib-metadata@${PY_FLAVOR} +.endif -.include +.include diff --git a/devel/py-virtualenv/distinfo b/devel/py-virtualenv/distinfo index 8b97e30e2940..f6b727027814 100644 --- a/devel/py-virtualenv/distinfo +++ b/devel/py-virtualenv/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1568815876 -SHA256 (pypa-virtualenv-16.7.5_GH0.tar.gz) = b14f2548f9d9b3db3309756069d2df9cbb8eb1cbd5f968437fc4580a6dbf19b6 -SIZE (pypa-virtualenv-16.7.5_GH0.tar.gz) = 5108645 +TIMESTAMP = 1668801951 +SHA256 (pypa-virtualenv-20.16.7_GH0.tar.gz) = 5aca63a79f180330fec063323a3604a84f61c6003784d88f2f033bea6193d058 +SIZE (pypa-virtualenv-20.16.7_GH0.tar.gz) = 12253560 diff --git a/devel/py-virtualenv/files/patch-docs_conf.py b/devel/py-virtualenv/files/patch-docs_conf.py index 9ce57124c7bf..9d0dd6d85969 100644 --- a/devel/py-virtualenv/files/patch-docs_conf.py +++ b/devel/py-virtualenv/files/patch-docs_conf.py @@ -1,15 +1,15 @@ ---- docs/conf.py.orig 2019-09-03 16:32:54 UTC +--- docs/conf.py.orig 2022-11-12 21:38:58 UTC +++ docs/conf.py -@@ -4,7 +4,11 @@ import os - import re +@@ -1,9 +1,12 @@ ++import os import subprocess import sys --from pathlib import Path -+if sys.version_info[0] == 2: -+ from pathlib2 import Path -+else: -+ from pathlib import Path + from datetime import date, datetime + from pathlib import Path + + import sphinx_rtd_theme ++ +sys.path.insert(0, os.path.abspath('../build/lib')) - from virtualenv import __version__ + from virtualenv.version import __version__