Re: Update: devel/py-pip 9.0.3 -> 19.0.3
On Tue, Apr 16, 2019 at 01:34:40AM +0200, Antoine Jacoutot wrote:
> No. Comment shouldn't start with uppercase.
I hadn't known that one before. Thank you.
Here's an updated version.
--Kurt
Index: Makefile
===
RCS file: /cvs/ports/devel/py-pip/Makefile,v
retrieving revision 1.31
diff -u -p -r1.31 Makefile
--- Makefile4 Apr 2018 20:04:56 - 1.31
+++ Makefile16 Apr 2019 00:10:37 -
@@ -1,8 +1,8 @@
# $OpenBSD: Makefile,v 1.31 2018/04/04 20:04:56 danj Exp $
-COMMENT = Python easy_install replacement
+COMMENT = tool for installing Python packages
-MODPY_EGG_VERSION =9.0.3
+MODPY_EGG_VERSION =19.0.3
DISTNAME = pip-${MODPY_EGG_VERSION}
PKGNAME = py-${DISTNAME}
CATEGORIES = devel
@@ -17,23 +17,10 @@ MODULES = lang/python
MODPY_PI = Yes
MODPY_SETUPTOOLS = Yes
-BUILD_DEPENDS =textproc/py-sphinx${MODPY_FLAVOR}
-
FLAVORS = python3
FLAVOR ?=
# No test suites in pypi tarball
NO_TEST = Yes
-
-DOCSRC = ${WRKSRC}/docs
-post-build:
- cd ${DOCSRC} && PYTHONPATH=${WRKSRC} \
- ${LOCALBASE}/bin/sphinx-build${MODPY_BIN_SUFFIX} -N .
_build/html
-
-DOCS = ${PREFIX}/share/doc/${MODPY_PY_PREFIX}pip
-
-post-install:
- ${INSTALL_DATA_DIR} ${DOCS}
- cd ${DOCSRC}/_build/html && pax -rw * ${DOCS}
.include
Index: distinfo
===
RCS file: /cvs/ports/devel/py-pip/distinfo,v
retrieving revision 1.16
diff -u -p -r1.16 distinfo
--- distinfo4 Apr 2018 20:04:56 - 1.16
+++ distinfo16 Apr 2019 00:10:37 -
@@ -1,2 +1,2 @@
-SHA256 (pip-9.0.3.tar.gz) = e/SPmmk74dWPSfevfgrp/in9ZxzeilXm7co1gcTvV5Y=
-SIZE (pip-9.0.3.tar.gz) = 1343076
+SHA256 (pip-19.0.3.tar.gz) = bm8Zehq/tFEY27h4tchZoO290z/SUBALwBW2f97UufI=
+SIZE (pip-19.0.3.tar.gz) = 1324617
Index: patches/patch-docs_conf_py
===
RCS file: patches/patch-docs_conf_py
diff -N patches/patch-docs_conf_py
--- patches/patch-docs_conf_py 16 Apr 2016 19:06:26 - 1.1
+++ /dev/null 1 Jan 1970 00:00:00 -
@@ -1,15 +0,0 @@
-$OpenBSD: patch-docs_conf_py,v 1.1 2016/04/16 19:06:26 shadchin Exp $
-
-Prevent build from calling out to the internet.
-
docs/conf.py.orig Fri Apr 15 21:02:46 2016
-+++ docs/conf.py Fri Apr 15 21:02:54 2016
-@@ -27,7 +27,7 @@ sys.path.insert(0, os.path.abspath(os.pardir))
- # Add any Sphinx extension module names here, as strings. They can be
- # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
- # extensions = ['sphinx.ext.autodoc']
--extensions = ['sphinx.ext.extlinks', 'docs.pipext', 'sphinx.ext.intersphinx']
-+extensions = ['sphinx.ext.extlinks', 'docs.pipext']
-
- # intersphinx
- intersphinx_cache_limit = 0
Index: patches/patch-docs_html_conf_py
===
RCS file: patches/patch-docs_html_conf_py
diff -N patches/patch-docs_html_conf_py
--- /dev/null 1 Jan 1970 00:00:00 -
+++ patches/patch-docs_html_conf_py 16 Apr 2019 00:10:37 -
@@ -0,0 +1,16 @@
+$OpenBSD$
+
+Prevent build from calling out to the internet.
+
+Index: docs/html/conf.py
+--- docs/html/conf.py.orig
docs/html/conf.py
+@@ -30,7 +30,7 @@ sys.path.insert(0, docs_dir)
+ # Add any Sphinx extension module names here, as strings. They can be
+ # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+ # extensions = ['sphinx.ext.autodoc']
+-extensions = ['sphinx.ext.extlinks', 'pip_sphinxext',
'sphinx.ext.intersphinx']
++extensions = ['sphinx.ext.extlinks', 'pip_sphinxext']
+
+ # intersphinx
+ intersphinx_cache_limit = 0
Index: pkg/DESCR
===
RCS file: /cvs/ports/devel/py-pip/pkg/DESCR,v
retrieving revision 1.2
diff -u -p -r1.2 DESCR
--- pkg/DESCR 12 Apr 2011 19:30:55 - 1.2
+++ pkg/DESCR 16 Apr 2019 00:10:37 -
@@ -1,3 +1,2 @@
-pip is a replacement for easy_install. It uses mostly the same
-techniques for finding packages, so packages that were made
-easy_installable should be pip-installable as well.
+pip is the package installer for Python. You can use pip to install
+packages from the Python Package Index and other indexes.
Index: pkg/PLIST
===
RCS file: /cvs/ports/devel/py-pip/pkg/PLIST,v
retrieving revision 1.13
diff -u -p -r1.13 PLIST
--- pkg/PLIST 4 Apr 2018 20:04:56 - 1.13
+++ pkg/PLIST 16 Apr 2019 00:10:37 -
@@ -10,23 +10,170 @@ lib/python${MODPY_VERSION}/site-packages
lib/python${MODPY_VERSION}/site-packages/pip-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
Re: Update: devel/py-pip 9.0.3 -> 19.0.3
On Mon, Apr 15, 2019 at 06:44:57PM +0200, Peter Hessler wrote:
> On 2019 Mar 31 (Sun) at 15:10:47 -0400 (-0400), Kurt Mosiejczuk wrote:
> :On Tue, Mar 19, 2019 at 09:01:53PM -0400, Kurt Mosiejczuk wrote:
> :> This updates devel/py-pip from 9.0.3 all the way up to the current
> :> 19.0.3.
> :
> :> I saw on a previous attempt it was suggested by danj@ to skip bundling
> :> the documentation, so I did that. The decision was helped by the fact
> :> that making the documentation as it was meant needing a pip more
> :> current than we had to build the new pip. This also means the py-sphinx
> :> BUILD_DEPENDS can go away.
> :
> :> I did a couple installs and uninstalls and it seems to behave fine.
> :> I worked through building devel/py-wbem (both 2 and 3 flavors) and
> :> net/napalm/py-napalm. All built fine.
> :
> :> I ran tests for devel/py-setuptools_scm (both flavors). There is one
> :> additional failure test for py-setuptools_scm that seems to be due to
> :> our ancient version of py-setuptools_scm calling pip in an obsolete way.
> :> (a newer version changes how the test is done. Doing the newer version
> :> of the test by hand works. I'd patch it, but I'll probably try tackling
> :> the new version of py-setuptools_SCM soon).
> :
> :> I tried repeatedly to run tests for sysutils/salt. It kept trying to
> :> build things rather than install the packages. I finally got it to
> :> try and run the tests, and they don't work. But, those tests don't
> :> work with the old version of pip either.
> :
> :ping
> :
> :--Kurt
> :
>
> OK
No. Comment shouldn't start with uppercase.
> :Index: Makefile
> :===
> :RCS file: /cvs/ports/devel/py-pip/Makefile,v
> :retrieving revision 1.31
> :diff -u -p -r1.31 Makefile
> :--- Makefile 4 Apr 2018 20:04:56 - 1.31
> :+++ Makefile 20 Mar 2019 00:57:10 -
> :@@ -1,8 +1,8 @@
> : # $OpenBSD: Makefile,v 1.31 2018/04/04 20:04:56 danj Exp $
> :
> :-COMMENT = Python easy_install replacement
> :+COMMENT = Tool for installing Python packages
> :
> :-MODPY_EGG_VERSION = 9.0.3
> :+MODPY_EGG_VERSION = 19.0.3
> : DISTNAME = pip-${MODPY_EGG_VERSION}
> : PKGNAME = py-${DISTNAME}
> : CATEGORIES =devel
> :@@ -17,23 +17,10 @@ MODULES =lang/python
> : MODPY_PI = Yes
> : MODPY_SETUPTOOLS = Yes
> :
> :-BUILD_DEPENDS = textproc/py-sphinx${MODPY_FLAVOR}
> :-
> : FLAVORS = python3
> : FLAVOR ?=
> :
> : # No test suites in pypi tarball
> : NO_TEST = Yes
> :-
> :-DOCSRC =${WRKSRC}/docs
> :-post-build:
> :-cd ${DOCSRC} && PYTHONPATH=${WRKSRC} \
> :-${LOCALBASE}/bin/sphinx-build${MODPY_BIN_SUFFIX} -N .
> _build/html
> :-
> :-DOCS = ${PREFIX}/share/doc/${MODPY_PY_PREFIX}pip
> :-
> :-post-install:
> :-${INSTALL_DATA_DIR} ${DOCS}
> :-cd ${DOCSRC}/_build/html && pax -rw * ${DOCS}
> :
> : .include
> :Index: distinfo
> :===
> :RCS file: /cvs/ports/devel/py-pip/distinfo,v
> :retrieving revision 1.16
> :diff -u -p -r1.16 distinfo
> :--- distinfo 4 Apr 2018 20:04:56 - 1.16
> :+++ distinfo 20 Mar 2019 00:57:10 -
> :@@ -1,2 +1,2 @@
> :-SHA256 (pip-9.0.3.tar.gz) = e/SPmmk74dWPSfevfgrp/in9ZxzeilXm7co1gcTvV5Y=
> :-SIZE (pip-9.0.3.tar.gz) = 1343076
> :+SHA256 (pip-19.0.3.tar.gz) = bm8Zehq/tFEY27h4tchZoO290z/SUBALwBW2f97UufI=
> :+SIZE (pip-19.0.3.tar.gz) = 1324617
> :Index: patches/patch-docs_conf_py
> :===
> :RCS file: patches/patch-docs_conf_py
> :diff -N patches/patch-docs_conf_py
> :--- patches/patch-docs_conf_py 16 Apr 2016 19:06:26 - 1.1
> :+++ /dev/null1 Jan 1970 00:00:00 -
> :@@ -1,15 +0,0 @@
> :-$OpenBSD: patch-docs_conf_py,v 1.1 2016/04/16 19:06:26 shadchin Exp $
> :-
> :-Prevent build from calling out to the internet.
> :-
> : docs/conf.py.orig Fri Apr 15 21:02:46 2016
> :-+++ docs/conf.pyFri Apr 15 21:02:54 2016
> :-@@ -27,7 +27,7 @@ sys.path.insert(0, os.path.abspath(os.pardir))
> :- # Add any Sphinx extension module names here, as strings. They can be
> :- # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
> :- # extensions = ['sphinx.ext.autodoc']
> :--extensions = ['sphinx.ext.extlinks', 'docs.pipext',
> 'sphinx.ext.intersphinx']
> :-+extensions = ['sphinx.ext.extlinks', 'docs.pipext']
> :-
> :- # intersphinx
> :- intersphinx_cache_limit = 0
> :Index: patches/patch-docs_html_conf_py
> :===
> :RCS file: patches/patch-docs_html_conf_py
> :diff -N patches/patch-docs_html_conf_py
> :--- /dev/null1 Jan 1970 00:00:00 -
> :+++ patches/patch-docs_html_conf_py 20 Mar 2019 00:57:10 -
> :@@ -0,0 +1,16 @@
> :+$OpenBSD$
> :+
> :+Prevent build from calling out to the internet.
> :+
> :+Index:
Re: Update: devel/py-pip 9.0.3 -> 19.0.3
On 2019 Mar 31 (Sun) at 15:10:47 -0400 (-0400), Kurt Mosiejczuk wrote:
:On Tue, Mar 19, 2019 at 09:01:53PM -0400, Kurt Mosiejczuk wrote:
:> This updates devel/py-pip from 9.0.3 all the way up to the current
:> 19.0.3.
:
:> I saw on a previous attempt it was suggested by danj@ to skip bundling
:> the documentation, so I did that. The decision was helped by the fact
:> that making the documentation as it was meant needing a pip more
:> current than we had to build the new pip. This also means the py-sphinx
:> BUILD_DEPENDS can go away.
:
:> I did a couple installs and uninstalls and it seems to behave fine.
:> I worked through building devel/py-wbem (both 2 and 3 flavors) and
:> net/napalm/py-napalm. All built fine.
:
:> I ran tests for devel/py-setuptools_scm (both flavors). There is one
:> additional failure test for py-setuptools_scm that seems to be due to
:> our ancient version of py-setuptools_scm calling pip in an obsolete way.
:> (a newer version changes how the test is done. Doing the newer version
:> of the test by hand works. I'd patch it, but I'll probably try tackling
:> the new version of py-setuptools_SCM soon).
:
:> I tried repeatedly to run tests for sysutils/salt. It kept trying to
:> build things rather than install the packages. I finally got it to
:> try and run the tests, and they don't work. But, those tests don't
:> work with the old version of pip either.
:
:ping
:
:--Kurt
:
OK
:Index: Makefile
:===
:RCS file: /cvs/ports/devel/py-pip/Makefile,v
:retrieving revision 1.31
:diff -u -p -r1.31 Makefile
:--- Makefile 4 Apr 2018 20:04:56 - 1.31
:+++ Makefile 20 Mar 2019 00:57:10 -
:@@ -1,8 +1,8 @@
: # $OpenBSD: Makefile,v 1.31 2018/04/04 20:04:56 danj Exp $
:
:-COMMENT = Python easy_install replacement
:+COMMENT = Tool for installing Python packages
:
:-MODPY_EGG_VERSION = 9.0.3
:+MODPY_EGG_VERSION = 19.0.3
: DISTNAME =pip-${MODPY_EGG_VERSION}
: PKGNAME = py-${DISTNAME}
: CATEGORIES = devel
:@@ -17,23 +17,10 @@ MODULES = lang/python
: MODPY_PI =Yes
: MODPY_SETUPTOOLS =Yes
:
:-BUILD_DEPENDS = textproc/py-sphinx${MODPY_FLAVOR}
:-
: FLAVORS = python3
: FLAVOR ?=
:
: # No test suites in pypi tarball
: NO_TEST = Yes
:-
:-DOCSRC = ${WRKSRC}/docs
:-post-build:
:- cd ${DOCSRC} && PYTHONPATH=${WRKSRC} \
:- ${LOCALBASE}/bin/sphinx-build${MODPY_BIN_SUFFIX} -N .
_build/html
:-
:-DOCS =${PREFIX}/share/doc/${MODPY_PY_PREFIX}pip
:-
:-post-install:
:- ${INSTALL_DATA_DIR} ${DOCS}
:- cd ${DOCSRC}/_build/html && pax -rw * ${DOCS}
:
: .include
:Index: distinfo
:===
:RCS file: /cvs/ports/devel/py-pip/distinfo,v
:retrieving revision 1.16
:diff -u -p -r1.16 distinfo
:--- distinfo 4 Apr 2018 20:04:56 - 1.16
:+++ distinfo 20 Mar 2019 00:57:10 -
:@@ -1,2 +1,2 @@
:-SHA256 (pip-9.0.3.tar.gz) = e/SPmmk74dWPSfevfgrp/in9ZxzeilXm7co1gcTvV5Y=
:-SIZE (pip-9.0.3.tar.gz) = 1343076
:+SHA256 (pip-19.0.3.tar.gz) = bm8Zehq/tFEY27h4tchZoO290z/SUBALwBW2f97UufI=
:+SIZE (pip-19.0.3.tar.gz) = 1324617
:Index: patches/patch-docs_conf_py
:===
:RCS file: patches/patch-docs_conf_py
:diff -N patches/patch-docs_conf_py
:--- patches/patch-docs_conf_py 16 Apr 2016 19:06:26 - 1.1
:+++ /dev/null 1 Jan 1970 00:00:00 -
:@@ -1,15 +0,0 @@
:-$OpenBSD: patch-docs_conf_py,v 1.1 2016/04/16 19:06:26 shadchin Exp $
:-
:-Prevent build from calling out to the internet.
:-
: docs/conf.py.orig Fri Apr 15 21:02:46 2016
:-+++ docs/conf.py Fri Apr 15 21:02:54 2016
:-@@ -27,7 +27,7 @@ sys.path.insert(0, os.path.abspath(os.pardir))
:- # Add any Sphinx extension module names here, as strings. They can be
:- # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
:- # extensions = ['sphinx.ext.autodoc']
:--extensions = ['sphinx.ext.extlinks', 'docs.pipext', 'sphinx.ext.intersphinx']
:-+extensions = ['sphinx.ext.extlinks', 'docs.pipext']
:-
:- # intersphinx
:- intersphinx_cache_limit = 0
:Index: patches/patch-docs_html_conf_py
:===
:RCS file: patches/patch-docs_html_conf_py
:diff -N patches/patch-docs_html_conf_py
:--- /dev/null 1 Jan 1970 00:00:00 -
:+++ patches/patch-docs_html_conf_py20 Mar 2019 00:57:10 -
:@@ -0,0 +1,16 @@
:+$OpenBSD$
:+
:+Prevent build from calling out to the internet.
:+
:+Index: docs/html/conf.py
:+--- docs/html/conf.py.orig
: docs/html/conf.py
:+@@ -30,7 +30,7 @@ sys.path.insert(0, docs_dir)
:+ # Add any Sphinx extension module names here, as strings. They can be
:+ # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
:+ # extensions = ['sphinx.ext.autodoc']
:+-extensions =
