Attachment #205208 for bug #229946

Lines 2-11 Link Here

(-)devel/py-pip/Makefile (-15 / +37 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= pip	4	PORTNAME= pip
5	PORTVERSION= 9.0.3	5	PORTVERSION= 19.1.1
6	PORTREVISION= 1
7	CATEGORIES= devel python	6	CATEGORIES= devel python
		7	MASTER_SITES= ${MASTER_SITE_CHEESESHOP}:test_wheel \
		8	${MASTER_SITE_CHEESESHOP}:test_setuptools
		9	MASTER_SITE_SUBDIR= bb/10/44230dd6bf3563b8f227dbf344c908d412ad2ff48066476672f3a72e174e:test_wheel \
		10	ec/51/f45cea425fd5cb0b0380f5b0f048ebc1da5b417e48d304838c02d6288a1e:test_setuptools
8	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}	11	PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX}
		12	DISTFILES= setuptools-41.0.1-py2.py3-none-any.whl:test_setuptools \
		13	wheel-0.33.4-py2.py3-none-any.whl:test_wheel
		14	DIST_SUBDIR= ${PORTNAME}
		15	EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
9		16
10	MAINTAINER= python@FreeBSD.org	17	MAINTAINER= python@FreeBSD.org
11	COMMENT= Tool for installing and managing Python packages	18	COMMENT= Tool for installing and managing Python packages
Lines 14-43 LICENSE= MIT Link Here
14	LICENSE_FILE= ${WRKSRC}/LICENSE.txt	21	LICENSE_FILE= ${WRKSRC}/LICENSE.txt
15		22
16	# Tests also need bzr, git, otherwise they fail	23	# Tests also need bzr, git, otherwise they fail
17	TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \	24	TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}freezegun>0:devel/py-freezegun@${PY_FLAVOR} \
		25	${PYTHON_PKGNAMEPREFIX}invoke>=0:devel/py-invoke@${PY_FLAVOR} \
		26	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \
		27	${PYTHON_PKGNAMEPREFIX}pretend>0:devel/py-pretend@${PY_FLAVOR} \
18	${PYTHON_PKGNAMEPREFIX}pytest-capturelog>0:devel/py-pytest-capturelog@${PY_FLAVOR} \	28	${PYTHON_PKGNAMEPREFIX}pytest-capturelog>0:devel/py-pytest-capturelog@${PY_FLAVOR} \
		29	${PYTHON_PKGNAMEPREFIX}pytest-rerunfailures>0:devel/py-pytest-rerunfailures@${PY_FLAVOR} \
19	${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout@${PY_FLAVOR} \	30	${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:devel/py-pytest-timeout@${PY_FLAVOR} \
20	${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} \	31	${PYTHON_PKGNAMEPREFIX}pytest-xdist>0:devel/py-pytest-xdist@${PY_FLAVOR} \
21	${PYTHON_PKGNAMEPREFIX}virtualenv>=1.10:devel/py-virtualenv@${PY_FLAVOR} \	32	${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} \
22	${PYTHON_PKGNAMEPREFIX}scripttest>=1.3:devel/py-scripttest@${PY_FLAVOR} \	33	${PYTHON_PKGNAMEPREFIX}scripttest>=1.3:devel/py-scripttest@${PY_FLAVOR} \
23	${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \	34	${PYTHON_PKGNAMEPREFIX}tox>0:devel/py-tox@${PY_FLAVOR} \
24	${PYTHON_PKGNAMEPREFIX}pretend>0:devel/py-pretend@${PY_FLAVOR} \	35	${PYTHON_PKGNAMEPREFIX}virtualenv>=1.10:devel/py-virtualenv@${PY_FLAVOR} \
25	${PYTHON_PKGNAMEPREFIX}freezegun>0:devel/py-freezegun@${PY_FLAVOR} \	36	${PYTHON_PKGNAMEPREFIX}wheel>=0.23.0:devel/py-wheel@${PY_FLAVOR} \
		37	${PYTHON_PKGNAMEPREFIX}yaml>0:devel/py-yaml@${PY_FLAVOR} \
		38	bzr>0:devel/bzr \
26	git>0:devel/git \	39	git>0:devel/git \
27	bzr>0:devel/bzr	40	python:lang/python \
		41	svn:devel/subversion
		42
		43	USES= python shebangfix
28		44
29	OPTIONS_DEFINE= DOCS	45	OPTIONS_DEFINE= DOCS
30		46
31	DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}	47	DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pypa-docs-theme>=g20180622:textproc/py-pypa-docs-theme@${PY_FLAVOR} \
32	DOCS_PORTDOCS= *	48	${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@${PY_FLAVOR}
33	DOCS_VARS= PYDISTUTILS_BUILD_TARGET=build_sphinx \	49	DOCS_PORTDOCS= *
34	PYDISTUTILS_BUILDARGS="-n --all-files --fresh-env"	50	DOCS_VARS= PYDISTUTILS_BUILD_TARGET=build_sphinx \
		51	PYDISTUTILS_BUILDARGS="-n --all-files --fresh-env"
		52	MAKE_ENV= PYTHONPATH=${WRKSRC}/src/
35		53
36	USES= python shebangfix
37	USE_GITHUB= yes	54	USE_GITHUB= yes
38	USE_PYTHON= autoplist concurrent distutils	55	USE_PYTHON= autoplist concurrent distutils
39		56
40	SHEBANG_FILES= pip/__init__.py	57	SHEBANG_FILES= src/pip/__init__.py
41		58
42	GH_ACCOUNT= pypa	59	GH_ACCOUNT= pypa
43		60
Lines 49-54 post-install-DOCS-on: Link Here
49	${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "! -name .buildinfo -and ! -name objects.inv")	66	${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "! -name .buildinfo -and ! -name objects.inv")
50		67
51	do-test:	68	do-test:
52	cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test	69	${MKDIR} ${WRKSRC}/tests/data/common_wheels
		70	# the tests check for these wheel files, so fetch them and copy them in
		71	${CP} ${DISTDIR}/${DIST_SUBDIR}/setuptools-41.0.1-py2.py3-none-any.whl ${WRKSRC}/tests/data/common_wheels
		72	${CP} ${DISTDIR}/${DIST_SUBDIR}/wheel-0.33.4-py2.py3-none-any.whl ${WRKSRC}/tests/data/common_wheels
		73	${LN} -sf ${LOCALBASE}/bin/pip ${LOCALBASE}/bin/pip3
		74	cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs
53		75
54	.include <bsd.port.mk>	76	.include <bsd.port.mk>

Lines 1-3 Link Here

(-)devel/py-pip/distinfo (-3 / +7 lines)
1	TIMESTAMP = 1521810422	1	TIMESTAMP = 1560864733
2	SHA256 (pypa-pip-9.0.3_GH0.tar.gz) = a582a1b8649828b57c23788879bd5263b9ff4f12083c52fb73ff20ca3531056d	2	SHA256 (pip/wheel-0.33.4-py2.py3-none-any.whl) = 5e79117472686ac0c4aef5bad5172ea73a1c2d1646b808c35926bd26bdfb0c08
3	SIZE (pypa-pip-9.0.3_GH0.tar.gz) = 6249079	3	SIZE (pip/wheel-0.33.4-py2.py3-none-any.whl) = 21524
		4	SHA256 (pip/setuptools-41.0.1-py2.py3-none-any.whl) = c7769ce668c7a333d84e17fe8b524b1c45e7ee9f7908ad0a73e1eda7e6a5aebf
		5	SIZE (pip/setuptools-41.0.1-py2.py3-none-any.whl) = 575966
		6	SHA256 (pip/pypa-pip-19.1.1_GH0.tar.gz) = cce3a3a4cc6f7e1f1d52d0dbe843ebca153ee42660a01acd9248d110c374efa2
		7	SIZE (pip/pypa-pip-19.1.1_GH0.tar.gz) = 6319774

Removed Link Here

(-)devel/py-pip/files/patch-setup.cfg (-9 lines)
1	--- setup.cfg.orig 2015-08-22 22:46:55 UTC
2	+++ setup.cfg
3	@@ -1,5 +1,6 @@
4	[pytest]
5	addopts = --ignore pip/_vendor --ignore tests/tests_cache
6	+norecursedirs = .tox build dist node_modules *.egg-info
7
8	[wheel]
9	universal=1

Lines 1-11 Link Here

(-)devel/py-pip/files/patch-setup.py (-6 / +8 lines)
1	--- setup.py.orig 2015-11-14 14:08:36 UTC	1	--- setup.py.orig 2018-11-13 02:28:08 UTC
2	+++ setup.py	2	+++ setup.py
3	@@ -78,8 +78,6 @@ setup(	3	@@ -73,8 +73,8 @@ setup(
4	entry_points={	4	entry_points={
5	"console_scripts": [	5	"console_scripts": [
6	"pip=pip:main",	6	"pip=pip._internal:main",
7	- "pip%s=pip:main" % sys.version[:1],	7	- "pip%s=pip._internal:main" % sys.version_info[:1],
8	- "pip%s=pip:main" % sys.version[:3],	8	- "pip%s.%s=pip._internal:main" % sys.version_info[:2],
		9	+# "pip%s=pip._internal:main" % sys.version_info[:1],
		10	+# "pip%s.%s=pip._internal:main" % sys.version_info[:2],
9	],	11	],
10	},	12	},
11	tests_require=tests_require,	13

Return to bug 229946