Date: Sun, 30 Jun 2019 01:34:12 +0800 From: Po-Chuan Hsieh <sunpoet@freebsd.org> To: Steve Wills <swills@freebsd.org> Cc: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: Re: svn commit: r505348 - in head/devel/py-pip: . files Message-ID: <CAMHz58SJ_G1TDYFajKb3v4X=m3mXjrvpT9YQ9ov_yuHBnBvcwQ@mail.gmail.com> In-Reply-To: <201906291259.x5TCxtGp020130@repo.freebsd.org> References: <201906291259.x5TCxtGp020130@repo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Sat, Jun 29, 2019 at 9:00 PM Steve Wills <swills@freebsd.org> wrote: > Author: swills > Date: Sat Jun 29 12:59:55 2019 > New Revision: 505348 > URL: https://svnweb.freebsd.org/changeset/ports/505348 > > Log: > devel/py-pip: Update to 19.1.1 > > PR: 229946 > Reviewed by: wen, miwi, koobs > Approved by: miwi > > Deleted: > head/devel/py-pip/files/patch-setup.cfg > Modified: > head/devel/py-pip/Makefile (contents, props changed) > head/devel/py-pip/distinfo (contents, props changed) > head/devel/py-pip/files/patch-setup.py (contents, props changed) > > Modified: head/devel/py-pip/Makefile > > ============================================================================== > --- head/devel/py-pip/Makefile Sat Jun 29 12:44:16 2019 (r505347) > +++ head/devel/py-pip/Makefile Sat Jun 29 12:59:55 2019 (r505348) > @@ -2,10 +2,15 @@ > # $FreeBSD$ > > PORTNAME= pip > -PORTVERSION= 9.0.3 > -PORTREVISION= 1 > +PORTVERSION= 19.1.1 > 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 > 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 > +DIST_SUBDIR= ${PORTNAME} > +EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX} > > MAINTAINER= python@FreeBSD.org > COMMENT= Tool for installing and managing Python packages > @@ -14,30 +19,40 @@ LICENSE= MIT > LICENSE_FILE= ${WRKSRC}/LICENSE.txt > > # Tests also need bzr, git, otherwise they fail > -TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} > \ > +TEST_DEPENDS= ${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}virtualenv>=1.10:devel/py-virtualenv@${PY_FLAVOR} > \ > + ${PYTHON_PKGNAMEPREFIX}pytest>0:devel/py-pytest@${PY_FLAVOR} > \ > ${PYTHON_PKGNAMEPREFIX}scripttest>=1.3:devel/py-scripttest@${PY_FLAVOR} > \ > - ${PYTHON_PKGNAMEPREFIX}mock>0:devel/py-mock@${PY_FLAVOR} \ > - ${PYTHON_PKGNAMEPREFIX}pretend>0:devel/py-pretend@${PY_FLAVOR} > \ > - ${PYTHON_PKGNAMEPREFIX}freezegun>0:devel/py-freezegun@${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 \ > - bzr>0:devel/bzr > + svn:devel/subversion \ > + python:lang/python > Hi, It blocks poudriere build with -t flag. ====> Running Q/A tests (stage-qa) Error: lang/python should not be depended upon. Instead, use USES=python:xy with a specific version. *** Error code 1 Stop. make: stopped in /usr/ports/devel/py-pip > > +USES= python shebangfix > + > OPTIONS_DEFINE= DOCS > > -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@ > ${PY_FLAVOR} > -DOCS_PORTDOCS= * > -DOCS_VARS= PYDISTUTILS_BUILD_TARGET=build_sphinx \ > - PYDISTUTILS_BUILDARGS="-n --all-files --fresh-env" > +DOCS_BUILD_DEPENDS= > ${PYTHON_PKGNAMEPREFIX}pypa-docs-theme>=g20180622:textproc/py-pypa-docs-theme@${PY_FLAVOR} > \ > + ${PYTHON_PKGNAMEPREFIX}sphinx>0:textproc/py-sphinx@ > ${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 > +SHEBANG_FILES= src/pip/__init__.py > > GH_ACCOUNT= pypa > > @@ -49,6 +64,11 @@ post-install-DOCS-on: > ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "! -name .buildinfo -and > ! -name objects.inv") > > do-test: > - cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} 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 > + ${LN} -sf ${LOCALBASE}/bin/pip ${LOCALBASE}/bin/pip3 > + cd ${WRKSRC} && ${PYTHON_CMD} -m pytest -v -rs > > .include <bsd.port.mk> > > Modified: head/devel/py-pip/distinfo > > ============================================================================== > --- head/devel/py-pip/distinfo Sat Jun 29 12:44:16 2019 (r505347) > +++ head/devel/py-pip/distinfo Sat Jun 29 12:59:55 2019 (r505348) > @@ -1,3 +1,7 @@ > -TIMESTAMP = 1521810422 > -SHA256 (pypa-pip-9.0.3_GH0.tar.gz) = > a582a1b8649828b57c23788879bd5263b9ff4f12083c52fb73ff20ca3531056d > -SIZE (pypa-pip-9.0.3_GH0.tar.gz) = 6249079 > +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 > > Modified: head/devel/py-pip/files/patch-setup.py > > ============================================================================== > --- head/devel/py-pip/files/patch-setup.py Sat Jun 29 12:44:16 2019 > (r505347) > +++ head/devel/py-pip/files/patch-setup.py Sat Jun 29 12:59:55 2019 > (r505348) > @@ -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, > + > >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAMHz58SJ_G1TDYFajKb3v4X=m3mXjrvpT9YQ9ov_yuHBnBvcwQ>