Attachment 204808 Details for Bug 229946 – updated patch to update pip to 19.1.1

[patch] updated patch to update pip to 19.1.1

py-pip-19_1_1-rev2.diff (text/plain), 3.14 KB, created by Steve Wills on 2019-06-03 14:23:43 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Steve Wills

Created: 2019-06-03 14:23:43 UTC

Size: 3.14 KB

patch

obsolete

>diff --git devel/py-pip/Makefile devel/py-pip/Makefile
>index 8b1e34540c2a..3b98fe0d97c3 100644
>--- devel/py-pip/Makefile
>+++ devel/py-pip/Makefile
>@@ -2,9 +2,9 @@
> # $FreeBSD$
> 
> PORTNAME=	pip
>-PORTVERSION=	9.0.3
>-PORTREVISION=	1
>+PORTVERSION=	19.1.1
> CATEGORIES=	devel python
>+MASTER_SITES=	CHEESESHOP
> PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
> 
> MAINTAINER=	python@FreeBSD.org
>@@ -28,21 +28,16 @@ TEST_DEPENDS=	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
> 
> OPTIONS_DEFINE=	DOCS
> 
>-DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}
>+DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR} \
>+			${PYTHON_PKGNAMEPREFIX}pypa-docs-theme>=g20180622:textproc/py-pypa-docs-theme@${PY_FLAVOR}
> DOCS_PORTDOCS=	*
> DOCS_VARS=	PYDISTUTILS_BUILD_TARGET=build_sphinx \
> 		PYDISTUTILS_BUILDARGS="-n --all-files --fresh-env"
>+MAKE_ENV=	PYTHONPATH=${WRKSRC}/src/
> 
> USES=		python shebangfix
>-USE_GITHUB=	yes
> USE_PYTHON=	autoplist concurrent distutils
> 
>-SHEBANG_FILES=	pip/__init__.py
>-
>-GH_ACCOUNT=	pypa
>-
>-NO_ARCH=	yes
>-
> post-install-DOCS-on:
> 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
> 	(cd ${WRKSRC}/build/sphinx/html && \
>diff --git devel/py-pip/distinfo devel/py-pip/distinfo
>index ea0ebdc99724..5cbc32ec86f7 100644
>--- devel/py-pip/distinfo
>+++ devel/py-pip/distinfo
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1521810422
>-SHA256 (pypa-pip-9.0.3_GH0.tar.gz) = a582a1b8649828b57c23788879bd5263b9ff4f12083c52fb73ff20ca3531056d
>-SIZE (pypa-pip-9.0.3_GH0.tar.gz) = 6249079
>+TIMESTAMP = 1559331242
>+SHA256 (pip-19.1.1.tar.gz) = 44d3d7d3d30a1eb65c7e5ff1173cdf8f7467850605ac7cc3707b6064bddd0958
>+SIZE (pip-19.1.1.tar.gz) = 1334144
>diff --git devel/py-pip/files/patch-setup.cfg devel/py-pip/files/patch-setup.cfg
>index 2c38ba8d99a1..5832650a3c45 100644
>--- devel/py-pip/files/patch-setup.cfg
>+++ devel/py-pip/files/patch-setup.cfg
>@@ -1,9 +1,10 @@
>---- setup.cfg.orig	2015-08-22 22:46:55 UTC
>+--- setup.cfg.orig	2019-05-06 14:54:25 UTC
> +++ setup.cfg
>-@@ -1,5 +1,6 @@
>- [pytest]
>- addopts = --ignore pip/_vendor --ignore tests/tests_cache
>+@@ -12,6 +12,7 @@ known_first_party = 
>+ 	tests
>+ default_section = THIRDPARTY
>+ include_trailing_comma = true
> +norecursedirs = .tox build dist node_modules *.egg-info
>  
>- [wheel]
>- universal=1
>+ [flake8]
>+ exclude = 
>diff --git devel/py-pip/files/patch-setup.py devel/py-pip/files/patch-setup.py
>index 78f0c0ade243..b1b331289391 100644
>--- devel/py-pip/files/patch-setup.py
>+++ devel/py-pip/files/patch-setup.py
>@@ -1,11 +1,13 @@
>---- setup.py.orig	2015-11-14 14:08:36 UTC
>+--- setup.py.orig	2018-11-13 02:28:08 UTC
> +++ setup.py
>-@@ -78,8 +78,6 @@ setup(
>+@@ -73,8 +73,8 @@ setup(
>      entry_points={
>          "console_scripts": [
>-             "pip=pip:main",
>--            "pip%s=pip:main" % sys.version[:1],
>--            "pip%s=pip:main" % sys.version[:3],
>+             "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],
>          ],
>      },
>-     tests_require=tests_require,
>+

Actions: View | Diff

Attachments on bug 229946: 195358 | 196245 | 199192 | 199193 | 204807 | 204808 | 205208 | 205234