git: ee3473c33ef5 - main - devel/py-pip: Update to 22.0.4

From: Po-Chuan Hsieh <sunpoet_at_FreeBSD.org>
Date: Fri, 13 May 2022 11:48:45 UTC
The branch main has been updated by sunpoet:

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

commit ee3473c33ef5abd7dd898fb025cd7689f5cec8e0
Author:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
AuthorDate: 2022-05-13 11:35:42 +0000
Commit:     Po-Chuan Hsieh <sunpoet@FreeBSD.org>
CommitDate: 2022-05-13 11:40:07 +0000

    devel/py-pip: Update to 22.0.4
    
    Changes:        https://github.com/pypa/pip/blob/main/NEWS.rst
                    https://pip.pypa.io/en/stable/news/
---
 devel/py-pip/Makefile             | 31 +++++++++++++++----------------
 devel/py-pip/distinfo             | 14 +++++++-------
 devel/py-pip/files/patch-setup.py | 20 +++++++++-----------
 3 files changed, 31 insertions(+), 34 deletions(-)

diff --git a/devel/py-pip/Makefile b/devel/py-pip/Makefile
index cb0c4a8855a7..4ec009d8ebad 100644
--- a/devel/py-pip/Makefile
+++ b/devel/py-pip/Makefile
@@ -1,13 +1,13 @@
 # Created by: Nicola Vitale <nivit@FreeBSD.org>
 
 PORTNAME=	pip
-PORTVERSION=	20.3.4
+PORTVERSION=	22.0.4
 CATEGORIES=	devel python
-MASTER_SITES=	https://files.pythonhosted.org/packages/f9/d3/955738b20d3832dfa3cd3d9b07e29a8162edb480bf988332f5e6e48ca444/:test_setuptools \
-		https://files.pythonhosted.org/packages/a7/00/3df031b3ecd5444d572141321537080b40c1c25e1caa3d86cdd12e5e919c/:test_wheel
+MASTER_SITES=	https://files.pythonhosted.org/packages/fb/58/9efbfe68482dab9557c49d433a60fff9efd7ed8835f829eba8297c2c124a/:test_setuptools \
+		https://files.pythonhosted.org/packages/27/d6/003e593296a85fd6ed616ed962795b2f87709c3eee2bca4f6d0fe55c6d00/:test_wheel
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
-DISTFILES=	setuptools-44.0.0-py2.py3-none-any.whl:test_setuptools \
-		wheel-0.35.1-py2.py3-none-any.whl:test_wheel
+DISTFILES=	setuptools-62.1.0-py3-none-any.whl:test_setuptools \
+		wheel-0.37.1-py2.py3-none-any.whl:test_wheel
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
@@ -19,19 +19,14 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 # Tests also need bzr, git, otherwise they fail
 TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}csv23>=0:devel/py-csv23@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}freezegun>=0:devel/py-freezegun@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}invoke>=0:devel/py-invoke@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}mock>=0:devel/py-mock@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pretend>=0:devel/py-pretend@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytest>=0:devel/py-pytest@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest>=0,1:devel/py-pytest@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}pytest-cov>=0:devel/py-pytest-cov@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-rerunfailures>=0:devel/py-pytest-rerunfailures@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}pytest-timeout>=0:devel/py-pytest-timeout@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pytest-xdist>=0:devel/py-pytest-xdist@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}yaml>=0:devel/py-yaml@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scripttest>=0:devel/py-scripttest@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}sqlite3>=0:databases/py-sqlite3@${PY_FLAVOR} \
-		${PYTHON_PKGNAMEPREFIX}tox>=0:devel/py-tox@${PY_FLAVOR} \
+		${PYTHON_PKGNAMEPREFIX}tomli-w>=0:textproc/py-tomli-w@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}virtualenv>=0:devel/py-virtualenv@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}werkzeug>=0:www/py-werkzeug@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0:devel/py-wheel@${PY_FLAVOR} \
@@ -39,7 +34,7 @@ TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${
 		git:devel/git \
 		svn:devel/subversion
 
-USES=		cpe python:3.6+ shebangfix
+USES=		cpe python:3.7+ shebangfix
 CPE_VENDOR=	pypa
 USE_PYTHON=	autoplist concurrent distutils
 
@@ -54,8 +49,12 @@ SHEBANG_FILES=	src/pip/__init__.py
 OPTIONS_DEFINE=	DOCS
 
 DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}furo>=0:textproc/py-furo@${PY_FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}sphinx>=2.4.3,1:textproc/py-sphinx@${PY_FLAVOR} \
-			${PYTHON_PKGNAMEPREFIX}sphinx-inline-tabs>=0:textproc/py-sphinx-inline-tabs@${PY_FLAVOR}
+			${PYTHON_PKGNAMEPREFIX}myst-parser>=0:textproc/py-myst-parser@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}sphinx>=4.2,1<5,1:textproc/py-sphinx@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}sphinx-copybutton>=0:textproc/py-sphinx-copybutton@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}sphinx-inline-tabs>=0:textproc/py-sphinx-inline-tabs@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}sphinxcontrib-towncrier>=0.2.0a0:textproc/py-sphinxcontrib-towncrier@${PY_FLAVOR} \
+			${PYTHON_PKGNAMEPREFIX}towncrier>=0:textproc/py-towncrier@${PY_FLAVOR}
 DOCS_PORTDOCS=		*
 DOCS_VARS=		PYDISTUTILS_BUILD_TARGET=build_sphinx \
 			PYDISTUTILS_BUILDARGS="-n --all-files --fresh-env"
diff --git a/devel/py-pip/distinfo b/devel/py-pip/distinfo
index 4ffebfbd54ca..52a95d1e9e0b 100644
--- a/devel/py-pip/distinfo
+++ b/devel/py-pip/distinfo
@@ -1,7 +1,7 @@
-TIMESTAMP = 1618321124
-SHA256 (pip/setuptools-44.0.0-py2.py3-none-any.whl) = 180081a244d0888b0065e18206950d603f6550721bd6f8c0a10221ed467dd78e
-SIZE (pip/setuptools-44.0.0-py2.py3-none-any.whl) = 583230
-SHA256 (pip/wheel-0.35.1-py2.py3-none-any.whl) = 497add53525d16c173c2c1c733b8f655510e909ea78cc0e29d374243544b77a2
-SIZE (pip/wheel-0.35.1-py2.py3-none-any.whl) = 33174
-SHA256 (pip/pypa-pip-20.3.4_GH0.tar.gz) = cc21e03832d7ce96a0cf77ec1669661de35abb4366a9059fa54f1647e514ce3f
-SIZE (pip/pypa-pip-20.3.4_GH0.tar.gz) = 8758232
+TIMESTAMP = 1652122933
+SHA256 (pip/setuptools-62.1.0-py3-none-any.whl) = 26ead7d1f93efc0f8c804d9fafafbe4a44b179580a7105754b245155f9af05a8
+SIZE (pip/setuptools-62.1.0-py3-none-any.whl) = 1144059
+SHA256 (pip/wheel-0.37.1-py2.py3-none-any.whl) = 4bdcd7d840138086126cd09254dc6195fb4fc6f01c050a1d7236f2630db1d22a
+SIZE (pip/wheel-0.37.1-py2.py3-none-any.whl) = 35301
+SHA256 (pip/pypa-pip-22.0.4_GH0.tar.gz) = a9828528aa21cf87093e9332f94ea65931a51c443216f5d3a8f14451ef4f2bbf
+SIZE (pip/pypa-pip-22.0.4_GH0.tar.gz) = 9325766
diff --git a/devel/py-pip/files/patch-setup.py b/devel/py-pip/files/patch-setup.py
index 8d4dfaf076c1..701765fd5d2b 100644
--- a/devel/py-pip/files/patch-setup.py
+++ b/devel/py-pip/files/patch-setup.py
@@ -1,17 +1,15 @@
---- setup.py.orig	2020-08-11 11:26:41 UTC
+--- setup.py.orig	2022-03-06 23:51:55 UTC
 +++ setup.py
-@@ -76,10 +76,10 @@ setup(
+@@ -74,9 +74,9 @@ setup(
+     },
      entry_points={
          "console_scripts": [
-             "pip=pip._internal.cli.main:main",
+-            "pip=pip._internal.cli.main:main",
 -            "pip{}=pip._internal.cli.main:main".format(sys.version_info[0]),
--            "pip{}.{}=pip._internal.cli.main:main".format(
--                *sys.version_info[:2]
--            ),
-+            #"pip{}=pip._internal.cli.main:main".format(sys.version_info[0]),
-+            #"pip{}.{}=pip._internal.cli.main:main".format(
-+            #    *sys.version_info[:2]
-+            #),
+-            "pip{}.{}=pip._internal.cli.main:main".format(*sys.version_info[:2]),
++            # "pip=pip._internal.cli.main:main",
++            # "pip{}=pip._internal.cli.main:main".format(sys.version_info[0]),
++            # "pip{}.{}=pip._internal.cli.main:main".format(*sys.version_info[:2]),
          ],
      },
- 
+     zip_safe=False,