From 492b8b72ee51544dca028f3c56182426c39c7580 Mon Sep 17 00:00:00 2001 From: Sunpoet Po-Chuan Hsieh Date: Sat, 5 Sep 2020 10:11:52 +0000 Subject: [PATCH] Update to 20.2.2 Changes: https://github.com/pypa/pip/blob/master/NEWS.rst https://pip.pypa.io/en/stable/news/ --- devel/py-pip/Makefile | 68 ++++++++++++++++--------------- devel/py-pip/distinfo | 14 +++---- devel/py-pip/files/patch-setup.py | 18 ++++---- 3 files changed, 54 insertions(+), 46 deletions(-) diff --git a/devel/py-pip/Makefile b/devel/py-pip/Makefile index 6e3fc485e68c..cb28f44afc55 100644 --- a/devel/py-pip/Makefile +++ b/devel/py-pip/Makefile @@ -2,13 +2,13 @@ # $FreeBSD$ PORTNAME= pip -PORTVERSION= 19.1.1 +PORTVERSION= 20.2.2 CATEGORIES= devel python -MASTER_SITES= https://files.pythonhosted.org/packages/bb/10/44230dd6bf3563b8f227dbf344c908d412ad2ff48066476672f3a72e174e/:test_wheel \ - https://files.pythonhosted.org/packages/ec/51/f45cea425fd5cb0b0380f5b0f048ebc1da5b417e48d304838c02d6288a1e/:test_setuptools +MASTER_SITES= https://files.pythonhosted.org/packages/f9/d3/955738b20d3832dfa3cd3d9b07e29a8162edb480bf988332f5e6e48ca444/:test_setuptools \ + https://files.pythonhosted.org/packages/a7/00/3df031b3ecd5444d572141321537080b40c1c25e1caa3d86cdd12e5e919c/:test_wheel PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} -DISTFILES= setuptools-41.0.1-py2.py3-none-any.whl:test_setuptools \ - wheel-0.33.4-py2.py3-none-any.whl:test_wheel +DISTFILES= setuptools-44.0.0-py2.py3-none-any.whl:test_setuptools \ + wheel-0.35.1-py2.py3-none-any.whl:test_wheel DIST_SUBDIR= ${PORTNAME} EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} @@ -19,25 +19,39 @@ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.txt # Tests also need bzr, git, otherwise they fail -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}freezegun>0:devel/py-freezegun@${PY_FLAVOR} \ +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}cryptography>=0:security/py-cryptography@${PY_FLAVOR} \ + ${PYTHON_PKGNAMEPREFIX}csv23>=0:devel/py-csv23@${PY_FLAVOR} \ + ${PY_ENUM34} \ + ${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-capturelog>0:devel/py-pytest-capturelog@${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}pytest>0:devel/py-pytest@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}scripttest>=1.3:devel/py-scripttest@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}virtualenv>=1.10:devel/py-virtualenv@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}wheel>=0.23.0:devel/py-wheel@${PY_FLAVOR} \ - ${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \ - bzr>0:devel/bzr \ - git>0:devel/git \ + ${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-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}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} \ + bzr:devel/bzr \ + hg:devel/mercurial \ + git:devel/git \ svn:devel/subversion USES= python shebangfix +USE_PYTHON= autoplist concurrent distutils + +MAKE_ENV= PYTHONPATH=${WRKSRC}/src/ +NO_ARCH= yes + +USE_GITHUB= yes +GH_ACCOUNT= pypa + +SHEBANG_FILES= src/pip/__init__.py OPTIONS_DEFINE= DOCS @@ -46,16 +60,6 @@ DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pypa-docs-theme>=g20180622:textproc/p DOCS_PORTDOCS= * DOCS_VARS= PYDISTUTILS_BUILD_TARGET=build_sphinx \ PYDISTUTILS_BUILDARGS="-n --all-files --fresh-env" -MAKE_ENV= PYTHONPATH=${WRKSRC}/src/ - -USE_GITHUB= yes -USE_PYTHON= autoplist concurrent distutils - -SHEBANG_FILES= src/pip/__init__.py - -GH_ACCOUNT= pypa - -NO_ARCH= yes post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} @@ -65,8 +69,8 @@ post-install-DOCS-on: do-test: ${MKDIR} ${WRKSRC}/tests/data/common_wheels # the tests check for these wheel files, so fetch them and copy them in - ${CP} ${DISTDIR}/${DIST_SUBDIR}/setuptools-41.0.1-py2.py3-none-any.whl ${WRKSRC}/tests/data/common_wheels - ${CP} ${DISTDIR}/${DIST_SUBDIR}/wheel-0.33.4-py2.py3-none-any.whl ${WRKSRC}/tests/data/common_wheels + ${CP} ${DISTDIR}/${DIST_SUBDIR}/setuptools-44.0.0-py2.py3-none-any.whl ${WRKSRC}/tests/data/common_wheels + ${CP} ${DISTDIR}/${DIST_SUBDIR}/wheel-0.35.1-py2.py3-none-any.whl ${WRKSRC}/tests/data/common_wheels ${LN} -sf ${LOCALBASE}/bin/pip ${LOCALBASE}/bin/pip3 cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs diff --git a/devel/py-pip/distinfo b/devel/py-pip/distinfo index 5a6363571aab..727525b83297 100644 --- a/devel/py-pip/distinfo +++ b/devel/py-pip/distinfo @@ -1,7 +1,7 @@ -TIMESTAMP = 1561034170 -SHA256 (pip/setuptools-41.0.1-py2.py3-none-any.whl) = c7769ce668c7a333d84e17fe8b524b1c45e7ee9f7908ad0a73e1eda7e6a5aebf -SIZE (pip/setuptools-41.0.1-py2.py3-none-any.whl) = 575966 -SHA256 (pip/wheel-0.33.4-py2.py3-none-any.whl) = 5e79117472686ac0c4aef5bad5172ea73a1c2d1646b808c35926bd26bdfb0c08 -SIZE (pip/wheel-0.33.4-py2.py3-none-any.whl) = 21524 -SHA256 (pip/pypa-pip-19.1.1_GH0.tar.gz) = cce3a3a4cc6f7e1f1d52d0dbe843ebca153ee42660a01acd9248d110c374efa2 -SIZE (pip/pypa-pip-19.1.1_GH0.tar.gz) = 6319774 +TIMESTAMP = 1598970965 +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.2.2_GH0.tar.gz) = 31e4089275c151db5b986db27c2cb6c0033543d69565ab4f5e1387de721202cd +SIZE (pip/pypa-pip-20.2.2_GH0.tar.gz) = 8719081 diff --git a/devel/py-pip/files/patch-setup.py b/devel/py-pip/files/patch-setup.py index b1b331289391..8d4dfaf076c1 100644 --- a/devel/py-pip/files/patch-setup.py +++ b/devel/py-pip/files/patch-setup.py @@ -1,13 +1,17 @@ ---- setup.py.orig 2018-11-13 02:28:08 UTC +--- setup.py.orig 2020-08-11 11:26:41 UTC +++ setup.py -@@ -73,8 +73,8 @@ setup( +@@ -76,10 +76,10 @@ setup( entry_points={ "console_scripts": [ - "pip=pip._internal:main", -- "pip%s=pip._internal:main" % sys.version_info[:1], -- "pip%s.%s=pip._internal:main" % sys.version_info[:2], -+# "pip%s=pip._internal:main" % sys.version_info[:1], -+# "pip%s.%s=pip._internal:main" % 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] +- ), ++ #"pip{}=pip._internal.cli.main:main".format(sys.version_info[0]), ++ #"pip{}.{}=pip._internal.cli.main:main".format( ++ # *sys.version_info[:2] ++ #), ], },