From fe9d430c1e20eea380d9cd71d916af9ba858e370 Mon Sep 17 00:00:00 2001
From: sthen <sthen@openbsd.org>
Date: Sat, 10 Dec 2022 09:41:16 +0000
Subject: [PATCH] update to py3-virtualenv-20.17.1

---
 devel/py-virtualenv/Makefile  | 14 +++++++-------
 devel/py-virtualenv/distinfo  |  4 ++--
 devel/py-virtualenv/pkg/PLIST |  3 +--
 3 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/devel/py-virtualenv/Makefile b/devel/py-virtualenv/Makefile
index 8fbbd1da908..f79cd6d2907 100644
--- a/devel/py-virtualenv/Makefile
+++ b/devel/py-virtualenv/Makefile
@@ -1,10 +1,9 @@
 COMMENT =		virtual Python environment builder
 
-MODPY_EGG_VERSION =	20.16.7
+MODPY_EGG_VERSION =	20.17.1
 DISTNAME =		virtualenv-${MODPY_EGG_VERSION}
 PKGNAME =		py-${DISTNAME}
 CATEGORIES =		devel
-REVISION =		0
 
 HOMEPAGE =		https://virtualenv.pypa.io/
 
@@ -14,8 +13,6 @@ PERMIT_PACKAGE =	Yes
 MODULES =		lang/python
 
 MODPY_PI =		Yes
-MODPY_PYTEST =		Yes
-MODPY_PYTEST_ARGS =	tests
 MODPY_PYBUILD =		setuptools_scm
 
 # messes up naming of packaged wheels
@@ -29,9 +26,12 @@ RUN_DEPENDS =		sysutils/py-distlib${MODPY_FLAVOR} \
 			sysutils/py-platformdirs${MODPY_FLAVOR}
 TEST_DEPENDS =		devel/py-coverage${MODPY_FLAVOR} \
 			devel/py-flaky${MODPY_FLAVOR} \
-			devel/py-mock${MODPY_FLAVOR} \
+			sysutils/py-packaging${MODPY_FLAVOR} \
 			devel/py-test-mock${MODPY_FLAVOR} \
-			devel/py-test-timeout${MODPY_FLAVOR} \
-			sysutils/py-packaging${MODPY_FLAVOR}
+			devel/py-test-timeout${MODPY_FLAVOR}
+
+# i think this shouldn't be needed as it seems like it should use the
+# vendored copy, but pytest infrastructure in ports isn't finding it
+TEST_DEPENDS +=		devel/py-pip${MODPY_FLAVOR}
 
 .include <bsd.port.mk>
diff --git a/devel/py-virtualenv/distinfo b/devel/py-virtualenv/distinfo
index df183ca4f82..c3ad02159ef 100644
--- a/devel/py-virtualenv/distinfo
+++ b/devel/py-virtualenv/distinfo
@@ -1,2 +1,2 @@
-SHA256 (virtualenv-20.16.7.tar.gz) = hpHj/5OH90PgD2uyD3ASH15PWWyudUUx8rOzobGsaW4=
-SIZE (virtualenv-20.16.7.tar.gz) = 12268638
+SHA256 (virtualenv-20.17.1.tar.gz) = +LknaE78bxzCBsnbKXpXCrmtDlHBb6nkVIfTbRkFwFg=
+SIZE (virtualenv-20.17.1.tar.gz) = 12269737
diff --git a/devel/py-virtualenv/pkg/PLIST b/devel/py-virtualenv/pkg/PLIST
index 85f3c5a66da..f5ffa10d794 100644
--- a/devel/py-virtualenv/pkg/PLIST
+++ b/devel/py-virtualenv/pkg/PLIST
@@ -64,7 +64,6 @@ ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/virtualenv/activation/n
 lib/python${MODPY_VERSION}/site-packages/virtualenv/activation/nushell/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/virtualenv/activation/nushell/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/virtualenv/activation/nushell/activate.nu
-lib/python${MODPY_VERSION}/site-packages/virtualenv/activation/nushell/deactivate.nu
 lib/python${MODPY_VERSION}/site-packages/virtualenv/activation/powershell/
 lib/python${MODPY_VERSION}/site-packages/virtualenv/activation/powershell/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/virtualenv/activation/powershell/${MODPY_PYCACHE}/
@@ -337,7 +336,7 @@ lib/python${MODPY_VERSION}/site-packages/virtualenv/seed/wheels/embed/pip-22.3.1
 lib/python${MODPY_VERSION}/site-packages/virtualenv/seed/wheels/embed/setuptools-44.1.1-py2.py3-none-any.whl
 lib/python${MODPY_VERSION}/site-packages/virtualenv/seed/wheels/embed/setuptools-50.3.2-py3-none-any.whl
 lib/python${MODPY_VERSION}/site-packages/virtualenv/seed/wheels/embed/setuptools-59.6.0-py3-none-any.whl
-lib/python${MODPY_VERSION}/site-packages/virtualenv/seed/wheels/embed/setuptools-65.5.1-py3-none-any.whl
+lib/python${MODPY_VERSION}/site-packages/virtualenv/seed/wheels/embed/setuptools-65.6.3-py3-none-any.whl
 lib/python${MODPY_VERSION}/site-packages/virtualenv/seed/wheels/embed/wheel-0.37.1-py2.py3-none-any.whl
 lib/python${MODPY_VERSION}/site-packages/virtualenv/seed/wheels/embed/wheel-0.38.4-py3-none-any.whl
 lib/python${MODPY_VERSION}/site-packages/virtualenv/seed/wheels/periodic_update.py