Update to 19.1 (#1702525)

.gitignore

@@ -32,3 +32,5 @@ pip-0.7.2.tar.gz
 /pip-19.0.2-tests.tar.gz
 /pip-19.0.3.tar.gz
 /pip-19.0.3-tests.tar.gz
+/pip-19.1.tar.gz
+/pip-19.1-tests.tar.gz

d4264dc3b2ab292c9843fb1d001c7fc0a5fc67c4.patch

@@ -1,34 +0,0 @@
-From d4264dc3b2ab292c9843fb1d001c7fc0a5fc67c4 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Fri, 29 Mar 2019 18:36:45 +0100
-Subject: [PATCH] Pytest: Use get_closest_marker
-
-See https://github.com/pytest-dev/pytest/pull/4564
----
- tests/conftest.py | 7 ++++---
- 1 file changed, 4 insertions(+), 3 deletions(-)
-
-diff --git a/tests/conftest.py b/tests/conftest.py
-index 6b2f3e3291..aed2f5a5ec 100644
---- a/tests/conftest.py
-+++ b/tests/conftest.py
-@@ -32,15 +32,16 @@ def pytest_collection_modifyitems(config, items):
-             continue
- 
-         # Mark network tests as flaky
--        if item.get_marker('network') is not None and "CI" in os.environ:
-+        if (item.get_closest_marker('network') is not None and
-+                "CI" in os.environ):
-             item.add_marker(pytest.mark.flaky(reruns=3))
- 
-         if six.PY3:
--            if (item.get_marker('incompatible_with_test_venv') and
-+            if (item.get_closest_marker('incompatible_with_test_venv') and
-                     config.getoption("--use-venv")):
-                 item.add_marker(pytest.mark.skip(
-                     'Incompatible with test venv'))
--            if (item.get_marker('incompatible_with_venv') and
-+            if (item.get_closest_marker('incompatible_with_venv') and
-                     sys.prefix != sys.base_prefix):
-                 item.add_marker(pytest.mark.skip(
-                     'Incompatible with venv'))

dummy-certifi.patch

@@ -1,8 +1,8 @@
 diff --git a/src/pip/_vendor/certifi/core.py b/src/pip/_vendor/certifi/core.py
-index 2d02ea4..b1e4975 100644
+index 7271acf..9f0dc20 100644
 --- a/src/pip/_vendor/certifi/core.py
 +++ b/src/pip/_vendor/certifi/core.py
-@@ -11,9 +11,7 @@ import os
+@@ -10,6 +10,4 @@ import os
  
  
  def where():
@@ -10,6 +10,3 @@ index 2d02ea4..b1e4975 100644
 -
 -    return os.path.join(f, 'cacert.pem')
 +    return '/etc/pki/tls/certs/ca-bundle.crt'
- 
- 
- if __name__ == '__main__':

python-pip.spec

@@ -22,7 +22,7 @@
 Name:           python-%{srcname}
 # When updating, update the bundled libraries versions bellow!
 # You can use vendor_meta.sh in the dist git repo
-Version:        19.0.3
+Version:        19.1
 Release:        1%{?dist}
 Summary:        A tool for installing and managing Python packages
 
@@ -101,9 +101,6 @@ Patch3:         remove-existing-dist-only-if-path-conflicts.patch
 # https://bugzilla.redhat.com/show_bug.cgi?id=1655253
 Patch4:         dummy-certifi.patch
 
-# pytest 4 support
-Patch5:         https://github.com/pypa/pip/commit/d4264dc3b2ab292c9843fb1d001c7fc0a5fc67c4.patch
-
 # Downstream only patch
 # Users might have local installations of pip from using
 # `pip install --user --upgrade pip` on older versions.
@@ -131,15 +128,15 @@ Packages" or "Pip Installs Python".
 
 
 # Virtual provides for the packages bundled by pip.
-# You can find the versions in pip/_vendor/vendor.txt file.
+# You can find the versions in src/pip/_vendor/vendor.txt file.
 %global bundled() %{expand:
 Provides: bundled(python%{1}dist(appdirs)) = 1.4.3
 Provides: bundled(python%{1}dist(CacheControl)) = 0.12.5
-Provides: bundled(python%{1}dist(certifi)) = 2018.11.29
+Provides: bundled(python%{1}dist(certifi)) = 2019.3.9
 Provides: bundled(python%{1}dist(chardet)) = 3.0.4
 Provides: bundled(python%{1}dist(colorama)) = 0.4.1
 Provides: bundled(python%{1}dist(distlib)) = 0.2.8
-Provides: bundled(python%{1}dist(distro)) = 1.3.0
+Provides: bundled(python%{1}dist(distro)) = 1.4.0
 Provides: bundled(python%{1}dist(html5lib)) = 1.0.1
 Provides: bundled(python%{1}dist(idna)) = 2.8
 Provides: bundled(python%{1}dist(ipaddress)) = 1.0.22
@@ -147,12 +144,12 @@ Provides: bundled(python%{1}dist(lockfile)) = 0.12.2
 Provides: bundled(python%{1}dist(msgpack)) = 0.5.6
 Provides: bundled(python%{1}dist(packaging)) = 19.0
 Provides: bundled(python%{1}dist(pep517)) = 0.5.0
-Provides: bundled(python%{1}dist(progress)) = 1.4
+Provides: bundled(python%{1}dist(progress)) = 1.5
-Provides: bundled(python%{1}dist(pyparsing)) = 2.3.1
+Provides: bundled(python%{1}dist(pyparsing)) = 2.4.0
 Provides: bundled(python%{1}dist(pytoml)) = 0.1.20
 Provides: bundled(python%{1}dist(requests)) = 2.21.0
 Provides: bundled(python%{1}dist(retrying)) = 1.3.3
-Provides: bundled(python%{1}dist(setuptools)) = 40.6.3
+Provides: bundled(python%{1}dist(setuptools)) = 41.0.1
 Provides: bundled(python%{1}dist(six)) = 1.12.0
 Provides: bundled(python%{1}dist(urllib3)) = 1.24.1
 Provides: bundled(python%{1}dist(webencodings)) = 0.5.1
@@ -275,7 +272,6 @@ popd
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
-%patch5 -p1
 
 # this goes together with patch4
 rm src/pip/_vendor/certifi/*.pem
@@ -416,14 +412,15 @@ install -p dist/%{python_wheelname} -t %{buildroot}%{python_wheeldir}
 %if %{with tests}
 %check
 # bash completion tests only work from installed package
-# needs network https://github.com/pypa/pip/pull/6263
+# needs unaltered sys.path and we cannot do that in %%check
-#     test_constraints_local_editable_install_pep518
+#     test_pep517_and_build_options
-#     test_pep517_wheels_are_not_confused_with_other_files
+#     test_config_file_venv_option
-#     test_upgrade_argparse_shadowed
 # TODO investigate failures
 #     test_uninstall_non_local_distutils
-#     test_venv_modification
+pytest_k='not completion and
-%global pytest_k 'not completion and not test_constraints_local_editable_install_pep518 and not test_pep517_wheels_are_not_confused_with_other_files and not test_upgrade_argparse_shadowed and not test_uninstall_non_local_distutils and not test_venv_modification'
+          not test_pep517_and_build_options and
+          not test_config_file_venv_option and
+          not test_uninstall_non_local_distutils'
 
 mkdir _bin
 export PATH="$PWD/_bin:$PATH"
@@ -431,13 +428,13 @@ export PATH="$PWD/_bin:$PATH"
 %if %{with python2}
 export PYTHONPATH=%{buildroot}%{python2_sitelib}
 ln -s %{buildroot}%{_bindir}/pip2 _bin/pip
-%{__python2} -m pytest -m 'not network' -k %{pytest_k}
+%{__python2} -m pytest -m 'not network' -k "$(echo $pytest_k)"
 %endif
 
 
 export PYTHONPATH=%{buildroot}%{python3_sitelib}
 ln -sf %{buildroot}%{_bindir}/pip3 _bin/pip
-%{__python3} -m pytest -m 'not network' -k %{pytest_k}
+%{__python3} -m pytest -m 'not network' -k "$(echo $pytest_k)"
 %endif
 
 
@@ -496,6 +493,9 @@ ln -sf %{buildroot}%{_bindir}/pip3 _bin/pip
 %endif
 
 %changelog
+* Thu Apr 25 2019 Miro Hrončok <mhroncok@redhat.com> - 19.1-1
+- Update to 19.1 (#1702525)
+
 * Wed Mar 06 2019 Miro Hrončok <mhroncok@redhat.com> - 19.0.3-1
 - Update to 19.0.3 (#1679277)
 

sources

@@ -1,4 +1,4 @@
-SHA512 (pip-19.0.3.tar.gz) = 71562800d5e52e7eb9a49ebb77ac7d2ec2b2a3ef464c9f67a4a76ed1123dce57c59c422ac91dc688f91bf9e84ad13d6547ff3cb61ac4bec54ca9428512b83163
+SHA512 (pip-19.1.tar.gz) = b10f6a8e0cc71b4987657acb90e677217a485f3605cca3ac9fe946102a8b6e07346d69952469db264e9aa7753015695818f107e361beab8a9fd0fbd5410900df
-SHA512 (pip-19.0.3-tests.tar.gz) = 7708661ffa529da3d96734f6659b6a0ae6d53d896ac0513cf18fb153f8bc53737f4548f87f58f27e67633cc5fc521a04bc2f96fa4dd892e12dd7f6109b44d2b8
+SHA512 (pip-19.1-tests.tar.gz) = 9891c29522137ef0bbc49e8b3f18220ac1c784f4a91300d917b4e369b3d86e321b59877baa2a6af8c911b6dad3bdfbe031848fd7de093ed80208885dfe2a2c75
 SHA512 (d2e63fbfc62af3b7050f619b2f5bb8658985b931.tar.gz) = fc7b11c5cbf6322469ce2eaca2a8d7eb60b17398d316f7465ab5d3d38dabd00ee22a3da7437a28f6312f0115f77f2df0d8bf0abc671e055eef06356c94283409
 SHA512 (2018.2.tar.gz) = 4c09c43a70ecb3ca3bc9445b01bf209eb382e41d9c969145696dea38551992ed88fd9b725a1264380f3dbdf8acdaf5ada3ef86b44255cdfbdbe4a01a1630912d