Index: head/devel/py-pip/Makefile =================================================================== --- head/devel/py-pip/Makefile (revision 390182) +++ head/devel/py-pip/Makefile (revision 390183) @@ -1,53 +1,60 @@ # Created by: Nicola Vitale # $FreeBSD$ PORTNAME= pip -PORTVERSION= 6.1.1 +PORTVERSION= 7.0.3 CATEGORIES= devel python -MASTER_SITES= CHEESESHOP PKGNAMEPREFIX= ${PYTHON_PKGNAMEPREFIX} MAINTAINER= nivit@FreeBSD.org COMMENT= Tool for installing and managing Python packages 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} +GH_ACCOUNT= pypa -.if 0 -TEST_DEPENDS= tox:${PORTSDIR}/devel/py-tox -TOX_CMD= ${LOCALBASE}/bin/tox -.endif - .include .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 Index: head/devel/py-pip/distinfo =================================================================== --- head/devel/py-pip/distinfo (revision 390182) +++ head/devel/py-pip/distinfo (revision 390183) @@ -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 Index: head/devel/py-pip/files/patch-setup.cfg =================================================================== --- head/devel/py-pip/files/patch-setup.cfg (nonexistent) +++ head/devel/py-pip/files/patch-setup.cfg (revision 390183) @@ -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 Property changes on: head/devel/py-pip/files/patch-setup.cfg ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/py-pip/files/patch-setup.py =================================================================== --- head/devel/py-pip/files/patch-setup.py (nonexistent) +++ head/devel/py-pip/files/patch-setup.py (revision 390183) @@ -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, Property changes on: head/devel/py-pip/files/patch-setup.py ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/devel/py-pip/pkg-plist =================================================================== --- head/devel/py-pip/pkg-plist (revision 390182) +++ head/devel/py-pip/pkg-plist (revision 390183) @@ -1,62 +1,60 @@ %%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 %%PORTDOCS%%%%DOCSDIR%%/_sources/news.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/quickstart.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/reference/index.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/reference/pip.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/reference/pip_freeze.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/reference/pip_install.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/reference/pip_list.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/reference/pip_search.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/reference/pip_show.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/reference/pip_uninstall.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/reference/pip_wheel.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/usage.txt %%PORTDOCS%%%%DOCSDIR%%/_sources/user_guide.txt %%PORTDOCS%%%%DOCSDIR%%/_static/ajax-loader.gif %%PORTDOCS%%%%DOCSDIR%%/_static/basic.css %%PORTDOCS%%%%DOCSDIR%%/_static/comment-bright.png %%PORTDOCS%%%%DOCSDIR%%/_static/comment-close.png %%PORTDOCS%%%%DOCSDIR%%/_static/comment.png %%PORTDOCS%%%%DOCSDIR%%/_static/default.css %%PORTDOCS%%%%DOCSDIR%%/_static/doctools.js %%PORTDOCS%%%%DOCSDIR%%/_static/down-pressed.png %%PORTDOCS%%%%DOCSDIR%%/_static/down.png %%PORTDOCS%%%%DOCSDIR%%/_static/file.png %%PORTDOCS%%%%DOCSDIR%%/_static/jquery.js %%PORTDOCS%%%%DOCSDIR%%/_static/minus.png %%PORTDOCS%%%%DOCSDIR%%/_static/plus.png %%PORTDOCS%%%%DOCSDIR%%/_static/pygments.css %%PORTDOCS%%%%DOCSDIR%%/_static/searchtools.js %%PORTDOCS%%%%DOCSDIR%%/_static/sidebar.js %%PORTDOCS%%%%DOCSDIR%%/_static/underscore.js %%PORTDOCS%%%%DOCSDIR%%/_static/up-pressed.png %%PORTDOCS%%%%DOCSDIR%%/_static/up.png %%PORTDOCS%%%%DOCSDIR%%/_static/websupport.js %%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 %%PORTDOCS%%%%DOCSDIR%%/news.html %%PORTDOCS%%%%DOCSDIR%%/quickstart.html %%PORTDOCS%%%%DOCSDIR%%/reference/index.html %%PORTDOCS%%%%DOCSDIR%%/reference/pip.html %%PORTDOCS%%%%DOCSDIR%%/reference/pip_freeze.html %%PORTDOCS%%%%DOCSDIR%%/reference/pip_install.html %%PORTDOCS%%%%DOCSDIR%%/reference/pip_list.html %%PORTDOCS%%%%DOCSDIR%%/reference/pip_search.html %%PORTDOCS%%%%DOCSDIR%%/reference/pip_show.html %%PORTDOCS%%%%DOCSDIR%%/reference/pip_uninstall.html %%PORTDOCS%%%%DOCSDIR%%/reference/pip_wheel.html %%PORTDOCS%%%%DOCSDIR%%/search.html %%PORTDOCS%%%%DOCSDIR%%/searchindex.js %%PORTDOCS%%%%DOCSDIR%%/usage.html %%PORTDOCS%%%%DOCSDIR%%/user_guide.html