Received: by mail.netbsd.org (Postfix, from userid 605) id 3815384F14; Thu, 8 Sep 2022 07:46:12 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 7240884E19 for ; Thu, 8 Sep 2022 07:46:11 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id AwqykENUtBHp for ; Thu, 8 Sep 2022 07:46:10 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 2867B84CF7 for ; Thu, 8 Sep 2022 07:46:10 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 25BFFFA90; Thu, 8 Sep 2022 07:46:10 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1662623170189670" MIME-Version: 1.0 Date: Thu, 8 Sep 2022 07:46:10 +0000 From: "Adam Ciarcinski" Subject: CVS commit: pkgsrc/devel/py-virtualenv To: pkgsrc-changes@NetBSD.org Reply-To: adam@netbsd.org X-Mailer: log_accum Message-Id: <20220908074610.25BFFFA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1662623170189670 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: adam Date: Thu Sep 8 07:46:10 UTC 2022 Modified Files: pkgsrc/devel/py-virtualenv: Makefile PLIST distinfo pkgsrc/devel/py-virtualenv/patches: patch-src_virtualenv_create_via__global__ref_api.py patch-tests_unit_create_test__creator.py patch-tests_unit_seed_embed_test__bootstrap__link__via__app__data.py Log Message: py-virtualenv: updated to 20.16.5 v20.16.5 (2022-09-07) --------------------- Bugfixes - 20.16.5 ~~~~~~~~~~~~~~~~~~ - Do not turn echo off for subsequent commands in batch activators (``activate.bat`` and ``deactivate.bat``) - by :user:`pawelszramowski`. v20.16.4 (2022-08-29) --------------------- Bugfixes - 20.16.4 ~~~~~~~~~~~~~~~~~~ - Bump embed setuptools to ``65.3`` - by :user:`gaborbernat`. v20.16.3 (2022-08-04) --------------------- Bugfixes - 20.16.3 ~~~~~~~~~~~~~~~~~~ - Upgrade embedded pip to ``22.2.2`` from ``22.2.1`` and setuptools to ``63.4.1`` from ``63.2.0`` - by :user:`gaborbernat`. v20.16.2 (2022-07-27) --------------------- Bugfixes - 20.16.2 ~~~~~~~~~~~~~~~~~~ - Bump embeded pip from ``22.2`` to ``22.2.1`` - by :user:`gaborbernat`. v20.16.1 (2022-07-26) --------------------- Features - 20.16.1 ~~~~~~~~~~~~~~~~~~ - Update Nushell activation scripts to version 0.67 - by :user:`kubouch`. v20.16.0 (2022-07-25) --------------------- Features - 20.16.0 ~~~~~~~~~~~~~~~~~~ - Drop support for running under Python 2 (still can generate Python 2 environments) - by :user:`gaborbernat`. - Upgrade embedded pip to ``22.2`` from ``22.1.2`` and setuptools to ``63.2.0`` from ``62.6.0`` - by :user:`gaborbernat`. To generate a diff of this commit: cvs rdiff -u -r1.57 -r1.58 pkgsrc/devel/py-virtualenv/Makefile cvs rdiff -u -r1.43 -r1.44 pkgsrc/devel/py-virtualenv/PLIST cvs rdiff -u -r1.45 -r1.46 pkgsrc/devel/py-virtualenv/distinfo cvs rdiff -u -r1.1 -r1.2 \ pkgsrc/devel/py-virtualenv/patches/patch-src_virtualenv_create_via__global__ref_api.py \ pkgsrc/devel/py-virtualenv/patches/patch-tests_unit_create_test__creator.py \ pkgsrc/devel/py-virtualenv/patches/patch-tests_unit_seed_embed_test__bootstrap__link__via__app__data.py Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1662623170189670 Content-Disposition: inline Content-Length: 12741 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/devel/py-virtualenv/Makefile diff -u pkgsrc/devel/py-virtualenv/Makefile:1.57 pkgsrc/devel/py-virtualenv/Makefile:1.58 --- pkgsrc/devel/py-virtualenv/Makefile:1.57 Thu Jul 7 11:49:50 2022 +++ pkgsrc/devel/py-virtualenv/Makefile Thu Sep 8 07:46:09 2022 @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.57 2022/07/07 11:49:50 adam Exp $ +# $NetBSD: Makefile,v 1.58 2022/09/08 07:46:09 adam Exp $ -DISTNAME= virtualenv-20.15.1 +DISTNAME= virtualenv-20.16.5 PKGNAME= ${PYPKGPREFIX}-${DISTNAME} CATEGORIES= devel python MASTER_SITES= ${MASTER_SITE_PYPI:=v/virtualenv/} @@ -11,26 +11,23 @@ COMMENT= Virtual Python Environment buil LICENSE= mit BUILD_DEPENDS+= ${PYPKGPREFIX}-setuptools_scm-[0-9]*:../../devel/py-setuptools_scm -DEPENDS+= ${PYPKGPREFIX}-distlib>=0.3.1:../../devel/py-distlib -DEPENDS+= ${PYPKGPREFIX}-filelock>=3.2:../../devel/py-filelock -DEPENDS+= ${PYPKGPREFIX}-platformdirs>=2:../../misc/py-platformdirs -DEPENDS+= ${PYPKGPREFIX}-six>=1.9.0:../../lang/py-six -TEST_DEPENDS+= ${PYPKGPREFIX}-coverage>=4:../../devel/py-coverage +DEPENDS+= ${PYPKGPREFIX}-distlib>=0.3.5:../../devel/py-distlib +DEPENDS+= ${PYPKGPREFIX}-filelock>=3.4.1:../../devel/py-filelock +DEPENDS+= ${PYPKGPREFIX}-platformdirs>=2.4:../../misc/py-platformdirs +TEST_DEPENDS+= ${PYPKGPREFIX}-coverage>=6.2:../../devel/py-coverage TEST_DEPENDS+= ${PYPKGPREFIX}-coverage-enable-subprocess>=1:../../devel/py-coverage-enable-subprocess -TEST_DEPENDS+= ${PYPKGPREFIX}-flaky>=3:../../devel/py-flaky -TEST_DEPENDS+= ${PYPKGPREFIX}-packaging>=20.0:../../devel/py-packaging -TEST_DEPENDS+= ${PYPKGPREFIX}-pip-[0-9]*:../../devel/py-pip -TEST_DEPENDS+= ${PYPKGPREFIX}-test>=4:../../devel/py-test +TEST_DEPENDS+= ${PYPKGPREFIX}-flaky>=3.7:../../devel/py-flaky +TEST_DEPENDS+= ${PYPKGPREFIX}-packaging>=21.3:../../devel/py-packaging +TEST_DEPENDS+= ${PYPKGPREFIX}-test>=7.0.1:../../devel/py-test TEST_DEPENDS+= ${PYPKGPREFIX}-test-env>=0.6.2:../../devel/py-test-env -TEST_DEPENDS+= ${PYPKGPREFIX}-test-freezegun>=0.4.1:../../devel/py-test-freezegun -TEST_DEPENDS+= ${PYPKGPREFIX}-test-mock>=2:../../devel/py-test-mock -TEST_DEPENDS+= ${PYPKGPREFIX}-test-randomly>=1:../../devel/py-test-randomly -TEST_DEPENDS+= ${PYPKGPREFIX}-test-timeout>=1:../../devel/py-test-timeout +TEST_DEPENDS+= ${PYPKGPREFIX}-test-freezegun>=0.4.2:../../devel/py-test-freezegun +TEST_DEPENDS+= ${PYPKGPREFIX}-test-mock>=3.6.1:../../devel/py-test-mock +TEST_DEPENDS+= ${PYPKGPREFIX}-test-randomly>=3.10.3:../../devel/py-test-randomly +TEST_DEPENDS+= ${PYPKGPREFIX}-test-timeout>=2.1:../../devel/py-test-timeout -PYTHON_VERSIONS_INCOMPATIBLE= 27 # py-filelock, py-platformdirs, py-packaging +PYTHON_VERSIONS_INCOMPATIBLE= 27 .include "../../lang/python/pyversion.mk" - .if ${_PYTHON_VERSION} == 37 DEPENDS+= ${PYPKGPREFIX}-importlib-metadata-[0-9]*:../../devel/py-importlib-metadata .endif Index: pkgsrc/devel/py-virtualenv/PLIST diff -u pkgsrc/devel/py-virtualenv/PLIST:1.43 pkgsrc/devel/py-virtualenv/PLIST:1.44 --- pkgsrc/devel/py-virtualenv/PLIST:1.43 Thu Jul 7 11:49:50 2022 +++ pkgsrc/devel/py-virtualenv/PLIST Thu Sep 8 07:46:09 2022 @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.43 2022/07/07 11:49:50 adam Exp $ +@comment $NetBSD: PLIST,v 1.44 2022/09/08 07:46:09 adam Exp $ bin/virtualenv-${PYVERSSUFFIX} ${PYSITELIB}/${EGG_INFODIR}/PKG-INFO ${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt @@ -270,12 +270,11 @@ ${PYSITELIB}/virtualenv/seed/wheels/embe ${PYSITELIB}/virtualenv/seed/wheels/embed/__init__.pyo ${PYSITELIB}/virtualenv/seed/wheels/embed/pip-20.3.4-py2.py3-none-any.whl ${PYSITELIB}/virtualenv/seed/wheels/embed/pip-21.3.1-py3-none-any.whl -${PYSITELIB}/virtualenv/seed/wheels/embed/pip-22.1.2-py3-none-any.whl +${PYSITELIB}/virtualenv/seed/wheels/embed/pip-22.2.2-py3-none-any.whl ${PYSITELIB}/virtualenv/seed/wheels/embed/setuptools-44.1.1-py2.py3-none-any.whl ${PYSITELIB}/virtualenv/seed/wheels/embed/setuptools-50.3.2-py3-none-any.whl ${PYSITELIB}/virtualenv/seed/wheels/embed/setuptools-59.6.0-py3-none-any.whl -${PYSITELIB}/virtualenv/seed/wheels/embed/setuptools-62.3.2-py3-none-any.whl -${PYSITELIB}/virtualenv/seed/wheels/embed/setuptools-62.6.0-py3-none-any.whl +${PYSITELIB}/virtualenv/seed/wheels/embed/setuptools-65.3.0-py3-none-any.whl ${PYSITELIB}/virtualenv/seed/wheels/embed/wheel-0.37.1-py2.py3-none-any.whl ${PYSITELIB}/virtualenv/seed/wheels/periodic_update.py ${PYSITELIB}/virtualenv/seed/wheels/periodic_update.pyc @@ -295,12 +294,6 @@ ${PYSITELIB}/virtualenv/util/lock.pyo ${PYSITELIB}/virtualenv/util/path/__init__.py ${PYSITELIB}/virtualenv/util/path/__init__.pyc ${PYSITELIB}/virtualenv/util/path/__init__.pyo -${PYSITELIB}/virtualenv/util/path/_pathlib/__init__.py -${PYSITELIB}/virtualenv/util/path/_pathlib/__init__.pyc -${PYSITELIB}/virtualenv/util/path/_pathlib/__init__.pyo -${PYSITELIB}/virtualenv/util/path/_pathlib/via_os_path.py -${PYSITELIB}/virtualenv/util/path/_pathlib/via_os_path.pyc -${PYSITELIB}/virtualenv/util/path/_pathlib/via_os_path.pyo ${PYSITELIB}/virtualenv/util/path/_permission.py ${PYSITELIB}/virtualenv/util/path/_permission.pyc ${PYSITELIB}/virtualenv/util/path/_permission.pyo @@ -310,15 +303,9 @@ ${PYSITELIB}/virtualenv/util/path/_sync. ${PYSITELIB}/virtualenv/util/path/_win.py ${PYSITELIB}/virtualenv/util/path/_win.pyc ${PYSITELIB}/virtualenv/util/path/_win.pyo -${PYSITELIB}/virtualenv/util/six.py -${PYSITELIB}/virtualenv/util/six.pyc -${PYSITELIB}/virtualenv/util/six.pyo ${PYSITELIB}/virtualenv/util/subprocess/__init__.py ${PYSITELIB}/virtualenv/util/subprocess/__init__.pyc ${PYSITELIB}/virtualenv/util/subprocess/__init__.pyo -${PYSITELIB}/virtualenv/util/subprocess/_win_subprocess.py -${PYSITELIB}/virtualenv/util/subprocess/_win_subprocess.pyc -${PYSITELIB}/virtualenv/util/subprocess/_win_subprocess.pyo ${PYSITELIB}/virtualenv/util/zipapp.py ${PYSITELIB}/virtualenv/util/zipapp.pyc ${PYSITELIB}/virtualenv/util/zipapp.pyo Index: pkgsrc/devel/py-virtualenv/distinfo diff -u pkgsrc/devel/py-virtualenv/distinfo:1.45 pkgsrc/devel/py-virtualenv/distinfo:1.46 --- pkgsrc/devel/py-virtualenv/distinfo:1.45 Thu Jul 7 11:49:50 2022 +++ pkgsrc/devel/py-virtualenv/distinfo Thu Sep 8 07:46:09 2022 @@ -1,8 +1,8 @@ -$NetBSD: distinfo,v 1.45 2022/07/07 11:49:50 adam Exp $ +$NetBSD: distinfo,v 1.46 2022/09/08 07:46:09 adam Exp $ -BLAKE2s (virtualenv-20.15.1.tar.gz) = 26ea920c79241f7b900241d08dc105d1d4b80f1a6f40247da7b65d56e8bf9bf4 -SHA512 (virtualenv-20.15.1.tar.gz) = 244e3b091c8b049edbb07d808633fd44b3327200e1d38394814794773d05723ef535721ee163b382d23bc16572d55657b5c2544efd83494753746cc85116696a -Size (virtualenv-20.15.1.tar.gz) = 13523736 bytes -SHA1 (patch-src_virtualenv_create_via__global__ref_api.py) = a55f2bbf974cb9cb6cbe79b8f29210a7db5ce470 -SHA1 (patch-tests_unit_create_test__creator.py) = ae1121ca6786801a4d690b70fdc4fdeb65488cca -SHA1 (patch-tests_unit_seed_embed_test__bootstrap__link__via__app__data.py) = c20b1ecdbfb576be3697c8c52f9f9d21e2e7e7b9 +BLAKE2s (virtualenv-20.16.5.tar.gz) = 0287f230ea6f255c501b15ac2597f8ac74f9eff28bb010696ab5f314246eef33 +SHA512 (virtualenv-20.16.5.tar.gz) = 2d4f96057eb8fea5da07126bbc656306b8ebc2db1c82a84b784fcb82cd1959a571dc1f016dead9561e1d073a8b06e10f2e225d6484b363b960adaa64239826d3 +Size (virtualenv-20.16.5.tar.gz) = 12223925 bytes +SHA1 (patch-src_virtualenv_create_via__global__ref_api.py) = cf39d9cdf0927b32865677d64ddcbd59ecc726a5 +SHA1 (patch-tests_unit_create_test__creator.py) = 4d0de65da957040c3f6e7e0682b6e6bdfdcf3abc +SHA1 (patch-tests_unit_seed_embed_test__bootstrap__link__via__app__data.py) = de17dc8e578af57c9c43f38343a0c0af0d04227d Index: pkgsrc/devel/py-virtualenv/patches/patch-src_virtualenv_create_via__global__ref_api.py diff -u pkgsrc/devel/py-virtualenv/patches/patch-src_virtualenv_create_via__global__ref_api.py:1.1 pkgsrc/devel/py-virtualenv/patches/patch-src_virtualenv_create_via__global__ref_api.py:1.2 --- pkgsrc/devel/py-virtualenv/patches/patch-src_virtualenv_create_via__global__ref_api.py:1.1 Mon May 9 22:08:10 2022 +++ pkgsrc/devel/py-virtualenv/patches/patch-src_virtualenv_create_via__global__ref_api.py Thu Sep 8 07:46:09 2022 @@ -1,22 +1,21 @@ -$NetBSD: patch-src_virtualenv_create_via__global__ref_api.py,v 1.1 2022/05/09 22:08:10 wiz Exp $ +$NetBSD: patch-src_virtualenv_create_via__global__ref_api.py,v 1.2 2022/09/08 07:46:09 adam Exp $ Copy distutils distro config file to virtualenv. https://github.com/pypa/virtualenv/issues/2313 ---- src/virtualenv/create/via_global_ref/api.py.orig 2022-04-11 10:38:39.000000000 +0000 +--- src/virtualenv/create/via_global_ref/api.py.orig 2022-09-08 02:18:47.000000000 +0000 +++ src/virtualenv/create/via_global_ref/api.py -@@ -4,6 +4,9 @@ import logging +@@ -2,6 +2,8 @@ import logging import os from abc import ABCMeta - + from pathlib import Path +from shutil import copy +from sysconfig import get_paths -+ - from six import add_metaclass from virtualenv.info import fs_supports_symlink -@@ -98,6 +101,10 @@ class ViaGlobalRefApi(Creator): - logging.debug("create %s", ensure_text(str(dest_path))) + +@@ -92,6 +94,10 @@ class ViaGlobalRefApi(Creator, metaclass + logging.debug("create %s", dest_path) dest_path.write_text(text) + distutils_distro_config = get_paths()["platlib"] + "/_distutils_system_mod.py" Index: pkgsrc/devel/py-virtualenv/patches/patch-tests_unit_create_test__creator.py diff -u pkgsrc/devel/py-virtualenv/patches/patch-tests_unit_create_test__creator.py:1.1 pkgsrc/devel/py-virtualenv/patches/patch-tests_unit_create_test__creator.py:1.2 --- pkgsrc/devel/py-virtualenv/patches/patch-tests_unit_create_test__creator.py:1.1 Mon May 9 22:08:10 2022 +++ pkgsrc/devel/py-virtualenv/patches/patch-tests_unit_create_test__creator.py Thu Sep 8 07:46:09 2022 @@ -1,14 +1,14 @@ -$NetBSD: patch-tests_unit_create_test__creator.py,v 1.1 2022/05/09 22:08:10 wiz Exp $ +$NetBSD: patch-tests_unit_create_test__creator.py,v 1.2 2022/09/08 07:46:09 adam Exp $ Fix testing, related to patch-src_virtualenv_create_via__global__ref_api.py. ---- tests/unit/create/test_creator.py.orig 2022-05-04 12:29:21.000000000 +0000 +--- tests/unit/create/test_creator.py.orig 2022-09-08 02:18:47.000000000 +0000 +++ tests/unit/create/test_creator.py -@@ -156,6 +156,7 @@ def test_create_no_seed(python, creator, +@@ -153,6 +153,7 @@ def test_create_no_seed(python, creator, purelib = creator.purelib - patch_files = {purelib / "{}.{}".format("_virtualenv", i) for i in ("py", "pyc", "pth")} + patch_files = {purelib / f"{'_virtualenv'}.{i}" for i in ("py", "pyc", "pth")} patch_files.add(purelib / "__pycache__") + patch_files.add(purelib / "_distutils_system_mod.py") content = set(creator.purelib.iterdir()) - patch_files - assert not content, "\n".join(ensure_text(str(i)) for i in content) - assert creator.env_name == ensure_text(dest.name) + assert not content, "\n".join(str(i) for i in content) + assert creator.env_name == str(dest.name) Index: pkgsrc/devel/py-virtualenv/patches/patch-tests_unit_seed_embed_test__bootstrap__link__via__app__data.py diff -u pkgsrc/devel/py-virtualenv/patches/patch-tests_unit_seed_embed_test__bootstrap__link__via__app__data.py:1.1 pkgsrc/devel/py-virtualenv/patches/patch-tests_unit_seed_embed_test__bootstrap__link__via__app__data.py:1.2 --- pkgsrc/devel/py-virtualenv/patches/patch-tests_unit_seed_embed_test__bootstrap__link__via__app__data.py:1.1 Mon May 9 22:08:10 2022 +++ pkgsrc/devel/py-virtualenv/patches/patch-tests_unit_seed_embed_test__bootstrap__link__via__app__data.py Thu Sep 8 07:46:09 2022 @@ -1,12 +1,12 @@ -$NetBSD: patch-tests_unit_seed_embed_test__bootstrap__link__via__app__data.py,v 1.1 2022/05/09 22:08:10 wiz Exp $ +$NetBSD: patch-tests_unit_seed_embed_test__bootstrap__link__via__app__data.py,v 1.2 2022/09/08 07:46:09 adam Exp $ Fix testing, related to patch-src_virtualenv_create_via__global__ref_api.py. ---- tests/unit/seed/embed/test_bootstrap_link_via_app_data.py.orig 2022-05-04 12:39:44.000000000 +0000 +--- tests/unit/seed/embed/test_bootstrap_link_via_app_data.py.orig 2022-09-08 02:18:47.000000000 +0000 +++ tests/unit/seed/embed/test_bootstrap_link_via_app_data.py -@@ -114,6 +114,7 @@ def test_seed_link_via_app_data(tmp_path +@@ -110,6 +110,7 @@ def test_seed_link_via_app_data(tmp_path purelib = result.creator.purelib - patch_files = {purelib / "{}.{}".format("_virtualenv", i) for i in ("py", "pyc", "pth")} + patch_files = {purelib / f"{'_virtualenv'}.{i}" for i in ("py", "pyc", "pth")} patch_files.add(purelib / "__pycache__") + patch_files.add(purelib / "_distutils_system_mod.py") post_run = set(site_package.iterdir()) - patch_files --_----------=_1662623170189670--