Update to 18.1 (#1652089)

python-pip.spec

@@ -22,10 +22,9 @@
 Name:           python-%{srcname}
 # When updating, update the bundled libraries versions bellow!
 # You can use vendor_meta.sh in the dist git repo
-Version:        18.0
-Release:        4%{?dist}
+Version:        18.1
+Release:        1%{?dist}
 Summary:        A tool for installing and managing Python packages
-Group:          Development/Libraries
 
 # We bundle a lot of libraries with pip, which itself is under MIT license.
 # Here is the list of the libraries with corresponding licenses:
@@ -42,6 +41,7 @@ Group:          Development/Libraries
 # progress: ISC
 # ipaddress: Python
 # packaging: ASL 2.0 or BSD
+# pep517: MIT
 # pyparsing: MIT
 # pytoml: MIT
 # retrying: ASL 2.0
@@ -55,7 +55,7 @@ Group:          Development/Libraries
 
 License:        MIT and Python and ASL 2.0 and BSD and ISC and LGPLv2 and MPLv2.0 and (ASL 2.0 or BSD)
 URL:            http://www.pip-installer.org
-Source0:        https://files.pythonhosted.org/packages/source/p/%{srcname}/%{srcname}-%{version}.tar.gz
+Source0:        %pypi_source
 
 BuildArch:      noarch
 
@@ -66,9 +66,9 @@ BuildRequires:  bzr
 
 # to get tests:
 # git clone https://github.com/pypa/pip && cd pip
-# git checkout 18.0 && tar -czvf ../pip-18.0-tests.tar.gz tests/
+# git checkout $VERSION && tar -czvf ../pip-$VERSION-tests.tar.gz tests/
 %if %{with tests}
-Source1:        pip-18.0-tests.tar.gz
+Source1:        pip-%{version}-tests.tar.gz
 %endif
 
 # Themes required to build the docs.
@@ -134,24 +134,24 @@ Provides: bundled(python%{1}dist(msgpack-python)) = 0.5.6
 Provides: bundled(python%{1}dist(lockfile)) = 0.12.2
 Provides: bundled(python%{1}dist(progress)) = 1.4
 Provides: bundled(python%{1}dist(ipaddress)) = 1.0.22
-Provides: bundled(python%{1}dist(packaging)) = 17.1
-Provides: bundled(python%{1}dist(pyparsing)) = 2.2.0
-Provides: bundled(python%{1}dist(pytoml)) = 0.1.16
+Provides: bundled(python%{1}dist(packaging)) = 18.0
+Provides: bundled(python%{1}dist(pep517)) = 0.2
+Provides: bundled(python%{1}dist(pyparsing)) = 2.2.1
+Provides: bundled(python%{1}dist(pytoml)) = 0.1.19
 Provides: bundled(python%{1}dist(retrying)) = 1.3.3
 Provides: bundled(python%{1}dist(requests)) = 2.19.1
-Provides: bundled(python%{1}dist(idna)) = 2.7
-Provides: bundled(python%{1}dist(certifi)) = 2018.4.16
-Provides: bundled(python%{1}dist(setuptools)) = 39.2.0
-Provides: bundled(python%{1}dist(webencodings)) = 0.5.1
 Provides: bundled(python%{1}dist(chardet)) = 3.0.4
+Provides: bundled(python%{1}dist(idna)) = 2.7
 Provides: bundled(python%{1}dist(urllib3)) = 1.23
+Provides: bundled(python%{1}dist(certifi)) = 2018.8.24
+Provides: bundled(python%{1}dist(setuptools)) = 40.4.3
+Provides: bundled(python%{1}dist(webencodings)) = 0.5.1
 }
 
 
 %if %{with python2}
 %package -n python2-%{srcname}
 Summary:        A tool for installing and managing Python 2 packages
-Group:          Development/Libraries
 BuildRequires:  python2-devel
 BuildRequires:  python2-setuptools
 %if %{with tests}
@@ -185,7 +185,6 @@ Packages" or "Pip Installs Python".
 
 %package -n python%{python3_pkgversion}-%{srcname}
 Summary:        A tool for installing and managing Python3 packages
-Group:          Development/Libraries
 
 BuildRequires:  python%{python3_pkgversion}-devel
 BuildRequires:  python%{python3_pkgversion}-setuptools
@@ -245,7 +244,7 @@ A Python wheel of pip to use with venv.
 tar -xf %{SOURCE1}
 %endif
 %if %{with doc}
-pushd docs
+pushd docs/html
 tar -xf %{SOURCE2}
 mv pypa-docs-theme-%{pypa_theme_commit_hash} pypa
 tar -xf %{SOURCE3}
@@ -271,12 +270,11 @@ popd
 %endif
 
 %if %{with doc}
-pushd docs
-export PYTHONPATH=../src/
-make html
-make man
-rm build/html/.buildinfo
-popd
+export PYTHONPATH=./src/
+# from tox.ini
+sphinx-build-3 -b html docs/html docs/build/html
+sphinx-build-3 -b man  docs/man  docs/build/man  -c docs/html
+rm docs/build/html/.buildinfo
 %endif
 
 
@@ -403,8 +401,6 @@ export PYTHONPATH=src
 %if %{with doc}
 %{_mandir}/man1/pip.*
 %{_mandir}/man1/pip2.*
-%{_mandir}/man1/pip-*
-%{_mandir}/man1/pip2-*
 %endif
 %{_bindir}/pip
 %{_bindir}/pip2
@@ -425,7 +421,6 @@ export PYTHONPATH=src
 %doc README.rst
 %if %{with doc}
 %{_mandir}/man1/pip3.*
-%{_mandir}/man1/pip3-*
 %endif
 %{_bindir}/pip3
 %{_bindir}/pip-3
@@ -454,6 +449,9 @@ export PYTHONPATH=src
 %endif
 
 %changelog
+* Thu Nov 22 2018 Miro Hrončok <mhroncok@redhat.com> - 18.1-1
+- Update to 18.1 (#1652089)
+
 * Tue Sep 18 2018 Victor Stinner <vstinner@redhat.com> - 18.0-4
 - Prevent removing of the system packages installed under /usr/lib
   when pip install -U is executed. Original patch by Michal Cyprian.