Date: Sun, 21 Jun 2015 05:34:54 +0000 (UTC) From: Kubilay Kocak <koobs@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r390183 - in head/devel/py-pip: . files Message-ID: <201506210534.t5L5Yslq019897@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: koobs Date: Sun Jun 21 05:34:53 2015 New Revision: 390183 URL: https://svnweb.freebsd.org/changeset/ports/390183 Log: devl/py-pip: Update to 7.0.3 - Update to 7.0.3 - Update pkg-plist - USE_GITHUB to get test suite (PyPI sdist doesnt include them) - Add TEST_DEPENDS and canonicalise regression-test: target - Patch setup.cfg so that tests run properly - Temporarily patch out versioned console_script's (pipX, pipX.Y) until USE_PYTHON=concurrent supports more granularity (coming soon). Note: A couple of tests fail because of these missing console_scripts. - Add USE_PYTHON=concurrent support accordingly. While I'm here: - Makefile: Sort sections - Makefile: Whitespace align Changes: https://pip.pypa.io/en/stable/news.html PR: 200688 Approved by: nivit (maintainer) Added: head/devel/py-pip/files/ head/devel/py-pip/files/patch-setup.cfg (contents, props changed) head/devel/py-pip/files/patch-setup.py (contents, props changed) Modified: head/devel/py-pip/Makefile head/devel/py-pip/distinfo head/devel/py-pip/pkg-plist Modified: head/devel/py-pip/Makefile ============================================================================== --- head/devel/py-pip/Makefile Sun Jun 21 05:00:10 2015 (r390182) +++ head/devel/py-pip/Makefile Sun Jun 21 05:34:53 2015 (r390183) @@ -2,9 +2,8 @@ # $FreeBSD$ PORTNAME= pip -PORTVERSION= 6.1.1 +PORTVERSION= 7.0.3 CATEGORIES= devel python -MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= nivit@FreeBSD.org @@ -12,42 +11,50 @@ COMMENT= Tool for installing and managin LICENSE= MIT -DOCS_BUILD_DEPENDS= sphinx-build:${PORTSDIR}/textproc/py-sphinx -DOCS_MAKE_ENV= HOME=${WRKDIR} +# Tests also need bzr, git, otherwise they fail +TEST_DEPENDS= ${PYTHON_PKGNAMEPREFIX}pytest>0:${PORTSDIR}/devel/py-pytest \ + ${PYTHON_PKGNAMEPREFIX}pytest-capturelog>0:${PORTSDIR}/devel/py-pytest-capturelog \ + ${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:${PORTSDIR}/devel/py-pytest-timeout \ + ${PYTHON_PKGNAMEPREFIX}pytest-timeout>0:${PORTSDIR}/devel/py-pytest-xdist \ + ${PYTHON_PKGNAMEPREFIX}virtualenv>=13.0.0:${PORTSDIR}/devel/py-virtualenv \ + ${PYTHON_PKGNAMEPREFIX}scripttest>=1.3:${PORTSDIR}/devel/py-scripttest \ + ${PYTHON_PKGNAMEPREFIX}mock>0:${PORTSDIR}/devel/py-mock \ + ${PYTHON_PKGNAMEPREFIX}pretend>0:${PORTSDIR}/devel/py-pretend \ + ${PYTHON_PKGNAMEPREFIX}freezegun>0:${PORTSDIR}/devel/py-freezegun \ + git>0:${PORTSDIR}/devel/git \ + bzr>0:${PORTSDIR}/devel/bzr OPTIONS_DEFINE= DOCS +DOCS_BUILD_DEPENDS= sphinx-build:${PORTSDIR}/textproc/py-sphinx +DOCS_MAKE_ENV= HOME=${WRKDIR} + USES= python shebangfix -USE_PYTHON= autoplist distutils +USE_GITHUB= yes +USE_PYTHON= autoplist concurrent distutils -# This port installs the following file in shared dirs -# PLIST_FILES= bin/pip +SHEBANG_FILES= pip/__init__.py +python_OLD_CMD= ${SETENV} python +python_CMD= ${PYTHON_CMD} -SHEBANG_FILES= pip/__init__.py -python_OLD_CMD= ${SETENV} python -python_CMD= ${PYTHON_CMD} - -.if 0 -TEST_DEPENDS= tox:${PORTSDIR}/devel/py-tox -TOX_CMD= ${LOCALBASE}/bin/tox -.endif +GH_ACCOUNT= pypa .include <bsd.port.options.mk> .if ${PORT_OPTIONS:MDOCS} DOCSDIR= ${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME} PYDISTUTILS_BUILD_TARGET+= build_sphinx -n --all-files --fresh-env +.endif post-install: +# ${RM} ${STAGEDIR}${PREFIX}/bin/pip2 +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${STAGEDIR}${DOCSDIR} (cd ${WRKSRC}/build/sphinx/html && \ ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR} "! -name .buildinfo -and ! -name objects.inv") .endif -.if 0 regression-test: build - @cd ${WRKSRC} && \ - ${TOX_CMD} -e py${PYTHON_SUFFIX},docs -.endif + @cd ${WRKSRC} && ${PYTHON_CMD} ${PYDISTUTILS_SETUP} test .include <bsd.port.mk> Modified: head/devel/py-pip/distinfo ============================================================================== --- head/devel/py-pip/distinfo Sun Jun 21 05:00:10 2015 (r390182) +++ head/devel/py-pip/distinfo Sun Jun 21 05:34:53 2015 (r390183) @@ -1,2 +1,2 @@ -SHA256 (pip-6.1.1.tar.gz) = 89f3b626d225e08e7f20d85044afa40f612eb3284484169813dc2d0631f2a556 -SIZE (pip-6.1.1.tar.gz) = 1051205 +SHA256 (pypa-pip-7.0.3_GH0.tar.gz) = 00d52c4a846ea3849489a473c3c4902237d31fa950068148badb4f43e8213fa2 +SIZE (pypa-pip-7.0.3_GH0.tar.gz) = 7848309 Added: head/devel/py-pip/files/patch-setup.cfg ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/py-pip/files/patch-setup.cfg Sun Jun 21 05:34:53 2015 (r390183) @@ -0,0 +1,9 @@ +--- setup.cfg.orig 2015-06-02 01:28:40 UTC ++++ setup.cfg +@@ -1,5 +1,6 @@ + [pytest] + addopts = --ignore pip/_vendor --ignore tests/tests_cache ++norecursedirs = .tox build dist node_modules *.egg-info + + [wheel] + universal=1 Added: head/devel/py-pip/files/patch-setup.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/py-pip/files/patch-setup.py Sun Jun 21 05:34:53 2015 (r390183) @@ -0,0 +1,11 @@ +--- setup.py.orig 2015-06-19 02:39:23 UTC ++++ setup.py +@@ -98,8 +98,6 @@ setup( + entry_points={ + "console_scripts": [ + "pip=pip:main", +- "pip%s=pip:main" % sys.version[:1], +- "pip%s=pip:main" % sys.version[:3], + ], + }, + tests_require=tests_require, Modified: head/devel/py-pip/pkg-plist ============================================================================== --- head/devel/py-pip/pkg-plist Sun Jun 21 05:00:10 2015 (r390182) +++ head/devel/py-pip/pkg-plist Sun Jun 21 05:34:53 2015 (r390183) @@ -1,7 +1,6 @@ %%PORTDOCS%%%%DOCSDIR%%/_sources/configuration.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/cookbook.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/development.txt -%%PORTDOCS%%%%DOCSDIR%%/_sources/distribute_setuptools.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/index.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/installing.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/logic.txt @@ -41,7 +40,6 @@ %%PORTDOCS%%%%DOCSDIR%%/configuration.html %%PORTDOCS%%%%DOCSDIR%%/cookbook.html %%PORTDOCS%%%%DOCSDIR%%/development.html -%%PORTDOCS%%%%DOCSDIR%%/distribute_setuptools.html %%PORTDOCS%%%%DOCSDIR%%/index.html %%PORTDOCS%%%%DOCSDIR%%/installing.html %%PORTDOCS%%%%DOCSDIR%%/logic.html
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201506210534.t5L5Yslq019897>