Create a python3(4) package.

Conflicts:
	.gitignore
	python-pip.spec
	sources

.gitignore

@@ -1,7 +1,14 @@
-/*.tar.gz
-/*.zip
-/pip-*/
-/pip/
-/results_python-pip/
-*.rpm
-
+pip-0.7.2.tar.gz
+/pip-0.8.tar.gz
+/pip-0.8.2.tar.gz
+/pip-0.8.3.tar.gz
+/pip-1.0.2.tar.gz
+/pip-1.1.tar.gz
+/pip-1.3.1.tar.gz
+/pip-1.4.1.tar.gz
+/pip-1.5.4.tar.gz
+/pip-1.5.6.tar.gz
+/pip-1.5.6-tests.tar.gz
+/pip-6.0.8.tar.gz
+/pip-7.0.3.tar.gz
+/pip-7.1.0.tar.gz

b30dd1e04e.patch

@@ -1,75 +0,0 @@
-From b30dd1e04e1f37901733f1be0a5a1e02c466ad0c Mon Sep 17 00:00:00 2001
-From: gutsytechster <prashantsharma161198@gmail.com>
-Date: Wed, 15 Apr 2020 19:54:48 +0530
-Subject: [PATCH] fix(tests/unit): Update tests to be endian safe
-
-This updates `test_path_to_display` and `test_str_to_display__encoding`
-to use the endian safe expected result instead of the hardcoded one.
-
-This fixes https://github.com/pypa/pip/issues/7921
----
- tests/unit/test_compat.py |  8 +++++++-
- tests/unit/test_utils.py  | 16 +++++++++++++---
- 2 files changed, 20 insertions(+), 4 deletions(-)
-
-diff --git a/tests/unit/test_compat.py b/tests/unit/test_compat.py
-index 1f31bc5ce8..b13087a1dd 100644
---- a/tests/unit/test_compat.py
-+++ b/tests/unit/test_compat.py
-@@ -2,6 +2,7 @@
- 
- import locale
- import os
-+import sys
- 
- import pytest
- 
-@@ -91,8 +92,13 @@ def test_str_to_display__decode_error(monkeypatch, caplog):
-     # Encode with an incompatible encoding.
-     data = u'ab'.encode('utf-16')
-     actual = str_to_display(data)
-+    # Keep the expected value endian safe
-+    if sys.byteorder == "little":
-+        expected = "\\xff\\xfea\x00b\x00"
-+    elif sys.byteorder == "big":
-+        expected = "\\xfe\\xff\x00a\x00b"
- 
--    assert actual == u'\\xff\\xfea\x00b\x00', (
-+    assert actual == expected, (
-         # Show the encoding for easier troubleshooting.
-         'encoding: {!r}'.format(locale.getpreferredencoding())
-     )
-diff --git a/tests/unit/test_utils.py b/tests/unit/test_utils.py
-index 7d74a66498..ebabd29e26 100644
---- a/tests/unit/test_utils.py
-+++ b/tests/unit/test_utils.py
-@@ -375,6 +375,18 @@ def test_rmtree_retries_for_3sec(tmpdir, monkeypatch):
-         rmtree('foo')
- 
- 
-+if sys.byteorder == "little":
-+    expected_byte_string = (
-+        u"b'\\xff\\xfe/\\x00p\\x00a\\x00t\\x00h\\x00/"
-+        "\\x00d\\x00\\xe9\\x00f\\x00'"
-+    )
-+elif sys.byteorder == "big":
-+    expected_byte_string = (
-+        u"b'\\xfe\\xff\\x00/\\x00p\\x00a\\x00t\\x00h\\"
-+        "x00/\\x00d\\x00\\xe9\\x00f'"
-+    )
-+
-+
- @pytest.mark.parametrize('path, fs_encoding, expected', [
-     (None, None, None),
-     # Test passing a text (unicode) string.
-@@ -383,9 +395,7 @@ def test_rmtree_retries_for_3sec(tmpdir, monkeypatch):
-     (u'/path/déf'.encode('utf-8'), 'utf-8', u'/path/déf'),
-     # Test a bytes object with a character that can't be decoded.
-     (u'/path/déf'.encode('utf-8'), 'ascii', u"b'/path/d\\xc3\\xa9f'"),
--    (u'/path/déf'.encode('utf-16'), 'utf-8',
--     u"b'\\xff\\xfe/\\x00p\\x00a\\x00t\\x00h\\x00/"
--     "\\x00d\\x00\\xe9\\x00f\\x00'"),
-+    (u'/path/déf'.encode('utf-16'), 'utf-8', expected_byte_string),
- ])
- def test_path_to_display(monkeypatch, path, fs_encoding, expected):
-     monkeypatch.setattr(sys, 'getfilesystemencoding', lambda: fs_encoding)

dummy-certifi.patch

@@ -1,27 +0,0 @@
-From 09bf87d33141a5c06a1d410839d162262baa16c4 Mon Sep 17 00:00:00 2001
-From: Tomas Hrnciar <thrnciar@redhat.com>
-Date: Sun, 26 Apr 2020 21:38:44 +0200
-Subject: [PATCH] Dummy certifi patch
-
----
- src/pip/_vendor/certifi/core.py | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
-diff --git a/src/pip/_vendor/certifi/core.py b/src/pip/_vendor/certifi/core.py
-index 56b52a3c..e99043f0 100644
---- a/src/pip/_vendor/certifi/core.py
-+++ b/src/pip/_vendor/certifi/core.py
-@@ -21,9 +21,7 @@ except ImportError:
- 
- 
- def where():
--    f = os.path.dirname(__file__)
--
--    return os.path.join(f, "cacert.pem")
-+    return '/etc/pki/tls/certs/ca-bundle.crt'
-
-
- def contents():
---
-2.23.0
-

emit-a-warning-when-running-with-root-privileges.patch

@@ -1,51 +0,0 @@
-From 74bb5d26e232493de43adfa1f4b42b66fd701294 Mon Sep 17 00:00:00 2001
-From: Tomas Hrnciar <thrnciar@redhat.com>
-Date: Sun, 26 Apr 2020 13:52:24 +0200
-Subject: [PATCH] Downstream only patch
-
-Emit a warning to the user if pip install is run with root privileges
-Issue upstream: https://github.com/pypa/pip/issues/4288
----
- src/pip/_internal/commands/install.py | 19 +++++++++++++++++++
- 1 file changed, 19 insertions(+)
-
-diff --git a/src/pip/_internal/commands/install.py b/src/pip/_internal/commands/install.py
-index 70bda2e2..1e750ae1 100644
---- a/src/pip/_internal/commands/install.py
-+++ b/src/pip/_internal/commands/install.py
-@@ -13,6 +13,8 @@ import operator
- import os
- import shutil
- import site
-+import sys
-+from os import path
- from optparse import SUPPRESS_HELP
- 
- from pip._vendor import pkg_resources
-@@ -241,6 +243,23 @@ class InstallCommand(RequirementCommand):
-             raise CommandError("Can not combine '--user' and '--target'")
- 
-         cmdoptions.check_install_build_global(options)
-+
-+        def is_venv():
-+            return (hasattr(sys, 'real_prefix') or
-+                    (hasattr(sys, 'base_prefix') and
-+                     sys.base_prefix != sys.prefix))
-+
-+        # Check whether we have root privileges and aren't in venv/virtualenv
-+        if os.getuid() == 0 and not is_venv() and not options.root_path:
-+            command = path.basename(sys.argv[0])
-+            if command == "__main__.py":
-+                command = path.basename(sys.executable) + " -m pip"
-+            logger.warning(
-+                "Running pip install with root privileges is "
-+                "generally not a good idea. Try `%s install --user` instead."
-+                % command
-+            )
-+
-         upgrade_strategy = "to-satisfy-only"
-         if options.upgrade:
-             upgrade_strategy = options.upgrade_strategy
--- 
-2.23.0
-

html_theme_path.patch

@@ -1,11 +0,0 @@
-diff -ru pip-10.0.1/docs/conf.py pip-10.0.1_patched/docs/conf.py
---- pip-10.0.1/docs/html/conf.py	2018-04-14 13:17:31.000000000 +0200
-+++ pip-10.0.1_patched/docs/html/conf.py	2018-07-23 15:23:31.053267611 +0200
-@@ -134,6 +134,7 @@
- # The theme to use for HTML and HTML Help pages.  Major themes that come with
- # Sphinx are currently 'default' and 'sphinxdoc'.
- html_theme = "pypa_theme"
-+html_theme_path = ["pypa", "python-docs-theme"]
- 
- # Theme options are theme-specific and customize the look and feel of a theme
- # further.  For a list of options available for each theme, see the

network-tests.patch

@@ -1,683 +0,0 @@
-From 621800d5c65aea36c6a1d9b685ff88f35cfce476 Mon Sep 17 00:00:00 2001
-From: Tomas Orsava <torsava@redhat.com>
-Date: Fri, 15 Nov 2019 19:44:54 +0100
-Subject: [PATCH] Mark 6 tests as network tests
-
-=================================== FAILURES ===================================
-_______________________________ test_freeze_path _______________________________
-tmpdir = Path('/tmp/pytest-of-mockbuild/pytest-0/test_freeze_path0')
-script = <tests.lib.PipTestEnvironment object at 0x7fe950a4caf0>
-data = <tests.lib.TestData object at 0x7fe950a4cc10>
-    def test_freeze_path(tmpdir, script, data):
-        """
-        Test freeze with --path.
-        """
->       script.pip('install', '--find-links', data.find_links,
-                   '--target', tmpdir, 'simple==2.0')
-tests/functional/test_freeze.py:712:
-_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
-tests/lib/__init__.py:593: in run
-    _check_stderr(
-_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
-stderr = "WARNING: Retrying (Retry(total=4, connect=None, read=None, redirect=None, status=None)) after connection broken by 'N...t at 0x7fe6435ef280>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/simple/\n"
-allow_stderr_warning = False, allow_stderr_error = False
-    def _check_stderr(
-        stderr, allow_stderr_warning, allow_stderr_error,
-    ):
-        """
-        Check the given stderr for logged warnings and errors.
-
-        :param stderr: stderr output as a string.
-        :param allow_stderr_warning: whether a logged warning (or deprecation
-            message) is allowed. Must be True if allow_stderr_error is True.
-        :param allow_stderr_error: whether a logged error is allowed.
-        """
-        assert not (allow_stderr_error and not allow_stderr_warning)
-
-        lines = stderr.splitlines()
-        for line in lines:
-            # First check for logging errors, which we don't allow during
-            # tests even if allow_stderr_error=True (since a logging error
-            # would signal a bug in pip's code).
-            #    Unlike errors logged with logger.error(), these errors are
-            # sent directly to stderr and so bypass any configured log formatter.
-            # The "--- Logging error ---" string is used in Python 3.4+, and
-            # "Logged from file " is used in Python 2.
-            if (line.startswith('--- Logging error ---') or
-                    line.startswith('Logged from file ')):
-                reason = 'stderr has a logging error, which is never allowed'
-                msg = make_check_stderr_message(stderr, line=line, reason=reason)
-                raise RuntimeError(msg)
-            if allow_stderr_error:
-                continue
-
-            if line.startswith('ERROR: '):
-                reason = (
-                    'stderr has an unexpected error '
-                    '(pass allow_stderr_error=True to permit this)'
-                )
-                msg = make_check_stderr_message(stderr, line=line, reason=reason)
-                raise RuntimeError(msg)
-            if allow_stderr_warning:
-                continue
-
-            if (line.startswith('WARNING: ') or
-                    line.startswith(DEPRECATION_MSG_PREFIX)):
-                reason = (
-                    'stderr has an unexpected warning '
-                    '(pass allow_stderr_warning=True to permit this)'
-                )
-                msg = make_check_stderr_message(stderr, line=line, reason=reason)
->               raise RuntimeError(msg)
-E               RuntimeError: stderr has an unexpected warning (pass allow_stderr_warning=True to permit this):
-E                Caused by line: "WARNING: Retrying (Retry(total=4, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7fe64364c850>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/simple/"
-E                Complete stderr: WARNING: Retrying (Retry(total=4, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7fe64364c850>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/simple/
-E               WARNING: Retrying (Retry(total=3, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7fe64364cdc0>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/simple/
-E               WARNING: Retrying (Retry(total=2, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7fe64364cf70>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/simple/
-E               WARNING: Retrying (Retry(total=1, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7fe6435ef130>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/simple/
-E               WARNING: Retrying (Retry(total=0, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7fe6435ef280>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/simple/
-tests/lib/__init__.py:404: RuntimeError
-________________________ test_freeze_path_exclude_user _________________________
-tmpdir = Path('/tmp/pytest-of-mockbuild/pytest-0/test_freeze_path_exclude_user0')
-script = <tests.lib.PipTestEnvironment object at 0x7fe950ec8fa0>
-data = <tests.lib.TestData object at 0x7fe950ec8a30>
-    def test_freeze_path_exclude_user(tmpdir, script, data):
-        """
-        Test freeze with --path and make sure packages from --user are not picked
-        up.
-        """
-        script.pip_install_local('--find-links', data.find_links,
-                                 '--user', 'simple2')
->       script.pip('install', '--find-links', data.find_links,
-                   '--target', tmpdir, 'simple==1.0')
-tests/functional/test_freeze.py:728:
-_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
-tests/lib/__init__.py:593: in run
-    _check_stderr(
-_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
-stderr = "WARNING: Retrying (Retry(total=4, connect=None, read=None, redirect=None, status=None)) after connection broken by 'N...t at 0x7f87ae751310>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/simple/\n"
-allow_stderr_warning = False, allow_stderr_error = False
-    def _check_stderr(
-        stderr, allow_stderr_warning, allow_stderr_error,
-    ):
-        """
-        Check the given stderr for logged warnings and errors.
-
-        :param stderr: stderr output as a string.
-        :param allow_stderr_warning: whether a logged warning (or deprecation
-            message) is allowed. Must be True if allow_stderr_error is True.
-        :param allow_stderr_error: whether a logged error is allowed.
-        """
-        assert not (allow_stderr_error and not allow_stderr_warning)
-
-        lines = stderr.splitlines()
-        for line in lines:
-            # First check for logging errors, which we don't allow during
-            # tests even if allow_stderr_error=True (since a logging error
-            # would signal a bug in pip's code).
-            #    Unlike errors logged with logger.error(), these errors are
-            # sent directly to stderr and so bypass any configured log formatter.
-            # The "--- Logging error ---" string is used in Python 3.4+, and
-            # "Logged from file " is used in Python 2.
-            if (line.startswith('--- Logging error ---') or
-                    line.startswith('Logged from file ')):
-                reason = 'stderr has a logging error, which is never allowed'
-                msg = make_check_stderr_message(stderr, line=line, reason=reason)
-                raise RuntimeError(msg)
-            if allow_stderr_error:
-                continue
-
-            if line.startswith('ERROR: '):
-                reason = (
-                    'stderr has an unexpected error '
-                    '(pass allow_stderr_error=True to permit this)'
-                )
-                msg = make_check_stderr_message(stderr, line=line, reason=reason)
-                raise RuntimeError(msg)
-            if allow_stderr_warning:
-                continue
-
-            if (line.startswith('WARNING: ') or
-                    line.startswith(DEPRECATION_MSG_PREFIX)):
-                reason = (
-                    'stderr has an unexpected warning '
-                    '(pass allow_stderr_warning=True to permit this)'
-                )
-                msg = make_check_stderr_message(stderr, line=line, reason=reason)
->               raise RuntimeError(msg)
-E               RuntimeError: stderr has an unexpected warning (pass allow_stderr_warning=True to permit this):
-E                Caused by line: "WARNING: Retrying (Retry(total=4, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f87ae7aa8e0>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/simple/"
-E                Complete stderr: WARNING: Retrying (Retry(total=4, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f87ae7aa8e0>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/simple/
-E               WARNING: Retrying (Retry(total=3, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f87ae7aae50>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/simple/
-E               WARNING: Retrying (Retry(total=2, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f87ae751040>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/simple/
-E               WARNING: Retrying (Retry(total=1, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f87ae7511c0>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/simple/
-E               WARNING: Retrying (Retry(total=0, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f87ae751310>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/simple/
-tests/lib/__init__.py:404: RuntimeError
-__________________________ test_freeze_path_multiple ___________________________
-tmpdir = Path('/tmp/pytest-of-mockbuild/pytest-0/test_freeze_path_multiple0')
-script = <tests.lib.PipTestEnvironment object at 0x7fe950b43fd0>
-data = <tests.lib.TestData object at 0x7fe950b43df0>
-    def test_freeze_path_multiple(tmpdir, script, data):
-        """
-        Test freeze with multiple --path arguments.
-        """
-        path1 = tmpdir / "path1"
-        os.mkdir(path1)
-        path2 = tmpdir / "path2"
-        os.mkdir(path2)
->       script.pip('install', '--find-links', data.find_links,
-                   '--target', path1, 'simple==2.0')
-tests/functional/test_freeze.py:750:
-_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
-tests/lib/__init__.py:593: in run
-    _check_stderr(
-_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
-stderr = "WARNING: Retrying (Retry(total=4, connect=None, read=None, redirect=None, status=None)) after connection broken by 'N...t at 0x7f07e6253280>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/simple/\n"
-allow_stderr_warning = False, allow_stderr_error = False
-    def _check_stderr(
-        stderr, allow_stderr_warning, allow_stderr_error,
-    ):
-        """
-        Check the given stderr for logged warnings and errors.
-
-        :param stderr: stderr output as a string.
-        :param allow_stderr_warning: whether a logged warning (or deprecation
-            message) is allowed. Must be True if allow_stderr_error is True.
-        :param allow_stderr_error: whether a logged error is allowed.
-        """
-        assert not (allow_stderr_error and not allow_stderr_warning)
-
-        lines = stderr.splitlines()
-        for line in lines:
-            # First check for logging errors, which we don't allow during
-            # tests even if allow_stderr_error=True (since a logging error
-            # would signal a bug in pip's code).
-            #    Unlike errors logged with logger.error(), these errors are
-            # sent directly to stderr and so bypass any configured log formatter.
-            # The "--- Logging error ---" string is used in Python 3.4+, and
-            # "Logged from file " is used in Python 2.
-            if (line.startswith('--- Logging error ---') or
-                    line.startswith('Logged from file ')):
-                reason = 'stderr has a logging error, which is never allowed'
-                msg = make_check_stderr_message(stderr, line=line, reason=reason)
-                raise RuntimeError(msg)
-            if allow_stderr_error:
-                continue
-
-            if line.startswith('ERROR: '):
-                reason = (
-                    'stderr has an unexpected error '
-                    '(pass allow_stderr_error=True to permit this)'
-                )
-                msg = make_check_stderr_message(stderr, line=line, reason=reason)
-                raise RuntimeError(msg)
-            if allow_stderr_warning:
-                continue
-
-            if (line.startswith('WARNING: ') or
-                    line.startswith(DEPRECATION_MSG_PREFIX)):
-                reason = (
-                    'stderr has an unexpected warning '
-                    '(pass allow_stderr_warning=True to permit this)'
-                )
-                msg = make_check_stderr_message(stderr, line=line, reason=reason)
->               raise RuntimeError(msg)
-E               RuntimeError: stderr has an unexpected warning (pass allow_stderr_warning=True to permit this):
-E                Caused by line: "WARNING: Retrying (Retry(total=4, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f07e62ae850>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/simple/"
-E                Complete stderr: WARNING: Retrying (Retry(total=4, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f07e62ae850>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/simple/
-E               WARNING: Retrying (Retry(total=3, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f07e62aedc0>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/simple/
-E               WARNING: Retrying (Retry(total=2, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f07e62aef70>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/simple/
-E               WARNING: Retrying (Retry(total=1, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f07e6253130>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/simple/
-E               WARNING: Retrying (Retry(total=0, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f07e6253280>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/simple/
-tests/lib/__init__.py:404: RuntimeError
-_________________ test_install_no_binary_builds_pep_517_wheel __________________
-script = <tests.lib.PipTestEnvironment object at 0x7fe9509f4e20>
-data = <tests.lib.TestData object at 0x7fe9509f4640>, with_wheel = None
-    def test_install_no_binary_builds_pep_517_wheel(script, data, with_wheel):
-        to_install = data.packages.joinpath('pep517_setup_and_pyproject')
->       res = script.pip(
-            'install', '--no-binary=:all:', '-f', data.find_links, to_install
-        )
-tests/functional/test_install.py:1279:
-_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
-self = <tests.lib.PipTestEnvironment object at 0x7fe9509f4e20>
-args = ('python', '-m', 'pip', 'install', '--no-binary=:all:', '-f', ...)
-kw = {'expect_stderr': True}
-cwd = Path('/tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/workspace/scratch')
-run_from = None, allow_stderr_error = False, allow_stderr_warning = False
-expect_error = None
-    def run(self, *args, **kw):
-        """
-        :param allow_stderr_error: whether a logged error is allowed in
-            stderr.  Passing True for this argument implies
-            `allow_stderr_warning` since warnings are weaker than errors.
-        :param allow_stderr_warning: whether a logged warning (or
-            deprecation message) is allowed in stderr.
-        :param expect_error: if False (the default), asserts that the command
-            exits with 0.  Otherwise, asserts that the command exits with a
-            non-zero exit code.  Passing True also implies allow_stderr_error
-            and allow_stderr_warning.
-        :param expect_stderr: whether to allow warnings in stderr (equivalent
-            to `allow_stderr_warning`).  This argument is an abbreviated
-            version of `allow_stderr_warning` and is also kept for backwards
-            compatibility.
-        """
-        if self.verbose:
-            print('>> running %s %s' % (args, kw))
-
-        cwd = kw.pop('cwd', None)
-        run_from = kw.pop('run_from', None)
-        assert not cwd or not run_from, "Don't use run_from; it's going away"
-        cwd = cwd or run_from or self.cwd
-        if sys.platform == 'win32':
-            # Partial fix for ScriptTest.run using `shell=True` on Windows.
-            args = [str(a).replace('^', '^^').replace('&', '^&') for a in args]
-
-        # Remove `allow_stderr_error` and `allow_stderr_warning` before
-        # calling run() because PipTestEnvironment doesn't support them.
-        allow_stderr_error = kw.pop('allow_stderr_error', None)
-        allow_stderr_warning = kw.pop('allow_stderr_warning', None)
-
-        # Propagate default values.
-        expect_error = kw.get('expect_error')
-        if expect_error:
-            # Then default to allowing logged errors.
-            if allow_stderr_error is not None and not allow_stderr_error:
-                raise RuntimeError(
-                    'cannot pass allow_stderr_error=False with '
-                    'expect_error=True'
-                )
-            allow_stderr_error = True
-
-        elif kw.get('expect_stderr'):
-            # Then default to allowing logged warnings.
-            if allow_stderr_warning is not None and not allow_stderr_warning:
-                raise RuntimeError(
-                    'cannot pass allow_stderr_warning=False with '
-                    'expect_stderr=True'
-                )
-            allow_stderr_warning = True
-
-        if allow_stderr_error:
-            if allow_stderr_warning is not None and not allow_stderr_warning:
-                raise RuntimeError(
-                    'cannot pass allow_stderr_warning=False with '
-                    'allow_stderr_error=True'
-                )
-
-        # Default values if not set.
-        if allow_stderr_error is None:
-            allow_stderr_error = False
-        if allow_stderr_warning is None:
-            allow_stderr_warning = allow_stderr_error
-
-        # Pass expect_stderr=True to allow any stderr.  We do this because
-        # we do our checking of stderr further on in check_stderr().
-        kw['expect_stderr'] = True
->       result = super(PipTestEnvironment, self).run(cwd=cwd, *args, **kw)
-E       AssertionError: Script returned code: 1
-tests/lib/__init__.py:586: AssertionError
------------------------------ Captured stdout call -----------------------------
-Script result: python -m pip install --no-binary=:all: -f file:///tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/data/packages /tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/data/packages/pep517_setup_and_pyproject
-  return code: 1
--- stderr: --------------------
-  ERROR: Command errored out with exit status 1:
-   command: /tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/workspace/venv/bin/python /builddir/build/BUILDROOT/python-pip-19.3.1-1.fc32.noarch/usr/lib/python3.8/site-packages/pip install --ignore-installed --no-user --prefix /tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/workspace/tmp/pip-build-env-ntp1m4dh/overlay --no-warn-script-location --no-binary :all: --only-binary :none: -i https://pypi.org/simple --find-links file:///tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/data/packages -- setuptools
-       cwd: None
-  Complete output (28 lines):
-  Looking in links: file:///tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/data/packages
-  WARNING: Retrying (Retry(total=4, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f7234ef1e50>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/setuptools/
-  WARNING: Retrying (Retry(total=3, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f7234e92040>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/setuptools/
-  WARNING: Retrying (Retry(total=2, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f7234e921c0>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/setuptools/
-  WARNING: Retrying (Retry(total=1, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f7234e92340>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/setuptools/
-  WARNING: Retrying (Retry(total=0, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f7234e924c0>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/setuptools/
-  Processing /tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/data/packages/setuptools-0.9.6.tar.gz
-      ERROR: Command errored out with exit status 1:
-       command: /tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/workspace/venv/bin/python -c 'import sys, setuptools, tokenize; sys.argv[0] = '"'"'/tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/workspace/tmp/pip-install-b_6lf4z6/setuptools/setup.py'"'"'; __file__='"'"'/tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/workspace/tmp/pip-install-b_6lf4z6/setuptools/setup.py'"'"';f=getattr(tokenize, '"'"'open'"'"', open)(__file__);code=f.read().replace('"'"'\r\n'"'"', '"'"'\n'"'"');f.close();exec(compile(code, __file__, '"'"'exec'"'"'))' egg_info --egg-base /tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/workspace/tmp/pip-install-b_6lf4z6/setuptools/pip-egg-info
-           cwd: /tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/workspace/tmp/pip-install-b_6lf4z6/setuptools/
-      Complete output (15 lines):
-      Traceback (most recent call last):
-        File "<string>", line 1, in <module>
-        File "/tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/workspace/tmp/pip-install-b_6lf4z6/setuptools/setuptools/__init__.py", line 2, in <module>
-          from setuptools.extension import Extension, Library
-        File "/tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/workspace/tmp/pip-install-b_6lf4z6/setuptools/setuptools/extension.py", line 5, in <module>
-          from setuptools.dist import _get_unpatched
-        File "/tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/workspace/tmp/pip-install-b_6lf4z6/setuptools/setuptools/dist.py", line 7, in <module>
-          from setuptools.command.install import install
-        File "/tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/workspace/tmp/pip-install-b_6lf4z6/setuptools/setuptools/command/__init__.py", line 8, in <module>
-          from setuptools.command import install_scripts
-        File "/tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/workspace/tmp/pip-install-b_6lf4z6/setuptools/setuptools/command/install_scripts.py", line 3, in <module>
-          from pkg_resources import Distribution, PathMetadata, ensure_directory
-        File "/tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/workspace/tmp/pip-install-b_6lf4z6/setuptools/pkg_resources.py", line 1545, in <module>
-          register_loader_type(importlib_bootstrap.SourceFileLoader, DefaultProvider)
-      AttributeError: module 'importlib._bootstrap' has no attribute 'SourceFileLoader'
-      ----------------------------------------
-  ERROR: Command errored out with exit status 1: python setup.py egg_info Check the logs for full command output.
-  ----------------------------------------
-ERROR: Command errored out with exit status 1: /tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/workspace/venv/bin/python /builddir/build/BUILDROOT/python-pip-19.3.1-1.fc32.noarch/usr/lib/python3.8/site-packages/pip install --ignore-installed --no-user --prefix /tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/workspace/tmp/pip-build-env-ntp1m4dh/overlay --no-warn-script-location --no-binary :all: --only-binary :none: -i https://pypi.org/simple --find-links file:///tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/data/packages -- setuptools Check the logs for full command output.
--- stdout: --------------------
-Looking in links: file:///tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/data/packages
-Processing /tmp/pytest-of-mockbuild/pytest-0/test_install_no_binary_builds_0/data/packages/pep517_setup_and_pyproject
-  Installing build dependencies: started
-  Installing build dependencies: finished with status 'error'
-_______________________ test_config_file_override_stack ________________________
-script = <tests.lib.PipTestEnvironment object at 0x7fe950d9b7f0>
-virtualenv = <VirtualEnvironment /tmp/pytest-of-mockbuild/pytest-0/test_config_file_override_stac0/workspace/venv>
-    def test_config_file_override_stack(script, virtualenv):
-        """
-        Test config files (global, overriding a global config with a
-        local, overriding all with a command line flag).
-
-        """
-        fd, config_file = tempfile.mkstemp('-pip.cfg', 'test-')
-        try:
->           _test_config_file_override_stack(script, virtualenv, config_file)
-tests/functional/test_install_config.py:144:
-_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
-tests/functional/test_install_config.py:172: in _test_config_file_override_stack
-    result = script.pip(
-_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
-self = <tests.lib.PipTestEnvironment object at 0x7fe950d9b7f0>
-args = ('python', '-m', 'pip', 'install', '-vvv', '--index-url', ...)
-kw = {'expect_stderr': True}
-cwd = Path('/tmp/pytest-of-mockbuild/pytest-0/test_config_file_override_stac0/workspace/scratch')
-run_from = None, allow_stderr_error = False, allow_stderr_warning = False
-expect_error = None
-    def run(self, *args, **kw):
-        """
-        :param allow_stderr_error: whether a logged error is allowed in
-            stderr.  Passing True for this argument implies
-            `allow_stderr_warning` since warnings are weaker than errors.
-        :param allow_stderr_warning: whether a logged warning (or
-            deprecation message) is allowed in stderr.
-        :param expect_error: if False (the default), asserts that the command
-            exits with 0.  Otherwise, asserts that the command exits with a
-            non-zero exit code.  Passing True also implies allow_stderr_error
-            and allow_stderr_warning.
-        :param expect_stderr: whether to allow warnings in stderr (equivalent
-            to `allow_stderr_warning`).  This argument is an abbreviated
-            version of `allow_stderr_warning` and is also kept for backwards
-            compatibility.
-        """
-        if self.verbose:
-            print('>> running %s %s' % (args, kw))
-
-        cwd = kw.pop('cwd', None)
-        run_from = kw.pop('run_from', None)
-        assert not cwd or not run_from, "Don't use run_from; it's going away"
-        cwd = cwd or run_from or self.cwd
-        if sys.platform == 'win32':
-            # Partial fix for ScriptTest.run using `shell=True` on Windows.
-            args = [str(a).replace('^', '^^').replace('&', '^&') for a in args]
-
-        # Remove `allow_stderr_error` and `allow_stderr_warning` before
-        # calling run() because PipTestEnvironment doesn't support them.
-        allow_stderr_error = kw.pop('allow_stderr_error', None)
-        allow_stderr_warning = kw.pop('allow_stderr_warning', None)
-
-        # Propagate default values.
-        expect_error = kw.get('expect_error')
-        if expect_error:
-            # Then default to allowing logged errors.
-            if allow_stderr_error is not None and not allow_stderr_error:
-                raise RuntimeError(
-                    'cannot pass allow_stderr_error=False with '
-                    'expect_error=True'
-                )
-            allow_stderr_error = True
-
-        elif kw.get('expect_stderr'):
-            # Then default to allowing logged warnings.
-            if allow_stderr_warning is not None and not allow_stderr_warning:
-                raise RuntimeError(
-                    'cannot pass allow_stderr_warning=False with '
-                    'expect_stderr=True'
-                )
-            allow_stderr_warning = True
-
-        if allow_stderr_error:
-            if allow_stderr_warning is not None and not allow_stderr_warning:
-                raise RuntimeError(
-                    'cannot pass allow_stderr_warning=False with '
-                    'allow_stderr_error=True'
-                )
-
-        # Default values if not set.
-        if allow_stderr_error is None:
-            allow_stderr_error = False
-        if allow_stderr_warning is None:
-            allow_stderr_warning = allow_stderr_error
-
-        # Pass expect_stderr=True to allow any stderr.  We do this because
-        # we do our checking of stderr further on in check_stderr().
-        kw['expect_stderr'] = True
->       result = super(PipTestEnvironment, self).run(cwd=cwd, *args, **kw)
-E       AssertionError: Script returned code: 1
-tests/lib/__init__.py:586: AssertionError
------------------------------ Captured stdout call -----------------------------
-Script result: python -m pip install -vvv --index-url https://pypi.org/simple/ INITools
-  return code: 1
--- stderr: --------------------
-WARNING: Retrying (Retry(total=4, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f9669c3d8b0>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/initools/
-WARNING: Retrying (Retry(total=3, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f9669c3da60>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/initools/
-WARNING: Retrying (Retry(total=2, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f9669c3dbe0>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/initools/
-WARNING: Retrying (Retry(total=1, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f9669c3dd60>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/initools/
-WARNING: Retrying (Retry(total=0, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f966900f490>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/initools/
-ERROR: Could not find a version that satisfies the requirement INITools (from versions: none)
-ERROR: No matching distribution found for INITools
--- stdout: --------------------
-Created temporary directory: /tmp/pytest-of-mockbuild/pytest-0/test_config_file_override_stac0/workspace/tmp/pip-ephem-wheel-cache-6gj33ens
-Created temporary directory: /tmp/pytest-of-mockbuild/pytest-0/test_config_file_override_stac0/workspace/tmp/pip-req-tracker-s7_2cwgc
-Created requirements tracker '/tmp/pytest-of-mockbuild/pytest-0/test_config_file_override_stac0/workspace/tmp/pip-req-tracker-s7_2cwgc'
-Created temporary directory: /tmp/pytest-of-mockbuild/pytest-0/test_config_file_override_stac0/workspace/tmp/pip-install-_91mh3df
-Looking in indexes: https://pypi.org/simple/
-1 location(s) to search for versions of INITools:
-* https://pypi.org/simple/initools/
-Getting page https://pypi.org/simple/initools/
-Found index url https://pypi.org/simple/
-Looking up "https://pypi.org/simple/initools/" in the cache
-Request header has "max_age" as 0, cache bypassed
-Starting new HTTPS connection (1): pypi.org:443
-Incremented Retry for (url='/simple/initools/'): Retry(total=4, connect=None, read=None, redirect=None, status=None)
-Starting new HTTPS connection (2): pypi.org:443
-Incremented Retry for (url='/simple/initools/'): Retry(total=3, connect=None, read=None, redirect=None, status=None)
-Starting new HTTPS connection (3): pypi.org:443
-Incremented Retry for (url='/simple/initools/'): Retry(total=2, connect=None, read=None, redirect=None, status=None)
-Starting new HTTPS connection (4): pypi.org:443
-Incremented Retry for (url='/simple/initools/'): Retry(total=1, connect=None, read=None, redirect=None, status=None)
-Starting new HTTPS connection (5): pypi.org:443
-Incremented Retry for (url='/simple/initools/'): Retry(total=0, connect=None, read=None, redirect=None, status=None)
-Starting new HTTPS connection (6): pypi.org:443
-Could not fetch URL https://pypi.org/simple/initools/: connection error: HTTPSConnectionPool(host='pypi.org', port=443): Max retries exceeded with url: /simple/initools/ (Caused by NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7f9669c15b50>: Failed to establish a new connection: [Errno -2] Name or service not known')) - skipping
-Given no hashes to check 0 links for project 'INITools': discarding no candidates
-Cleaning up...
-Removed build tracker '/tmp/pytest-of-mockbuild/pytest-0/test_config_file_override_stac0/workspace/tmp/pip-req-tracker-s7_2cwgc'
-Exception information:
-Traceback (most recent call last):
-  File "/builddir/build/BUILDROOT/python-pip-19.3.1-1.fc32.noarch/usr/lib/python3.8/site-packages/pip/_internal/cli/base_command.py", line 153, in _main
-    status = self.run(options, args)
-  File "/builddir/build/BUILDROOT/python-pip-19.3.1-1.fc32.noarch/usr/lib/python3.8/site-packages/pip/_internal/commands/install.py", line 401, in run
-    resolver.resolve(requirement_set)
-  File "/builddir/build/BUILDROOT/python-pip-19.3.1-1.fc32.noarch/usr/lib/python3.8/site-packages/pip/_internal/legacy_resolve.py", line 202, in resolve
-    self._resolve_one(requirement_set, req)
-  File "/builddir/build/BUILDROOT/python-pip-19.3.1-1.fc32.noarch/usr/lib/python3.8/site-packages/pip/_internal/legacy_resolve.py", line 368, in _resolve_one
-    abstract_dist = self._get_abstract_dist_for(req_to_install)
-  File "/builddir/build/BUILDROOT/python-pip-19.3.1-1.fc32.noarch/usr/lib/python3.8/site-packages/pip/_internal/legacy_resolve.py", line 314, in _get_abstract_dist_for
-    req.populate_link(self.finder, upgrade_allowed, self.require_hashes)
-  File "/builddir/build/BUILDROOT/python-pip-19.3.1-1.fc32.noarch/usr/lib/python3.8/site-packages/pip/_internal/req/req_install.py", line 226, in populate_link
-    self.link = finder.find_requirement(self, upgrade)
-  File "/builddir/build/BUILDROOT/python-pip-19.3.1-1.fc32.noarch/usr/lib/python3.8/site-packages/pip/_internal/index.py", line 905, in find_requirement
-    raise DistributionNotFound(
-pip._internal.exceptions.DistributionNotFound: No matching distribution found for INITools
-_______________________ test_no_upgrade_unless_requested _______________________
-script = <tests.lib.PipTestEnvironment object at 0x7fe950d86070>
-    def test_no_upgrade_unless_requested(script):
-        """
-        No upgrade if not specifically requested.
-
-        """
->       script.pip('install', 'INITools==0.1')
-tests/functional/test_install_upgrade.py:16:
-_ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _ _
-self = <tests.lib.PipTestEnvironment object at 0x7fe950d86070>
-args = ('python', '-m', 'pip', 'install', 'INITools==0.1')
-kw = {'expect_stderr': True}
-cwd = Path('/tmp/pytest-of-mockbuild/pytest-0/test_no_upgrade_unless_request0/workspace/scratch')
-run_from = None, allow_stderr_error = False, allow_stderr_warning = False
-expect_error = None
-    def run(self, *args, **kw):
-        """
-        :param allow_stderr_error: whether a logged error is allowed in
-            stderr.  Passing True for this argument implies
-            `allow_stderr_warning` since warnings are weaker than errors.
-        :param allow_stderr_warning: whether a logged warning (or
-            deprecation message) is allowed in stderr.
-        :param expect_error: if False (the default), asserts that the command
-            exits with 0.  Otherwise, asserts that the command exits with a
-            non-zero exit code.  Passing True also implies allow_stderr_error
-            and allow_stderr_warning.
-        :param expect_stderr: whether to allow warnings in stderr (equivalent
-            to `allow_stderr_warning`).  This argument is an abbreviated
-            version of `allow_stderr_warning` and is also kept for backwards
-            compatibility.
-        """
-        if self.verbose:
-            print('>> running %s %s' % (args, kw))
-
-        cwd = kw.pop('cwd', None)
-        run_from = kw.pop('run_from', None)
-        assert not cwd or not run_from, "Don't use run_from; it's going away"
-        cwd = cwd or run_from or self.cwd
-        if sys.platform == 'win32':
-            # Partial fix for ScriptTest.run using `shell=True` on Windows.
-            args = [str(a).replace('^', '^^').replace('&', '^&') for a in args]
-
-        # Remove `allow_stderr_error` and `allow_stderr_warning` before
-        # calling run() because PipTestEnvironment doesn't support them.
-        allow_stderr_error = kw.pop('allow_stderr_error', None)
-        allow_stderr_warning = kw.pop('allow_stderr_warning', None)
-
-        # Propagate default values.
-        expect_error = kw.get('expect_error')
-        if expect_error:
-            # Then default to allowing logged errors.
-            if allow_stderr_error is not None and not allow_stderr_error:
-                raise RuntimeError(
-                    'cannot pass allow_stderr_error=False with '
-                    'expect_error=True'
-                )
-            allow_stderr_error = True
-
-        elif kw.get('expect_stderr'):
-            # Then default to allowing logged warnings.
-            if allow_stderr_warning is not None and not allow_stderr_warning:
-                raise RuntimeError(
-                    'cannot pass allow_stderr_warning=False with '
-                    'expect_stderr=True'
-                )
-            allow_stderr_warning = True
-
-        if allow_stderr_error:
-            if allow_stderr_warning is not None and not allow_stderr_warning:
-                raise RuntimeError(
-                    'cannot pass allow_stderr_warning=False with '
-                    'allow_stderr_error=True'
-                )
-
-        # Default values if not set.
-        if allow_stderr_error is None:
-            allow_stderr_error = False
-        if allow_stderr_warning is None:
-            allow_stderr_warning = allow_stderr_error
-
-        # Pass expect_stderr=True to allow any stderr.  We do this because
-        # we do our checking of stderr further on in check_stderr().
-        kw['expect_stderr'] = True
->       result = super(PipTestEnvironment, self).run(cwd=cwd, *args, **kw)
-E       AssertionError: Script returned code: 1
-tests/lib/__init__.py:586: AssertionError
------------------------------ Captured stdout call -----------------------------
-Script result: python -m pip install INITools==0.1
-  return code: 1
--- stderr: --------------------
-WARNING: Retrying (Retry(total=4, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7fd66cc36700>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/initools/
-WARNING: Retrying (Retry(total=3, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7fd66cc36c40>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/initools/
-WARNING: Retrying (Retry(total=2, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7fd66cc36dc0>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/initools/
-WARNING: Retrying (Retry(total=1, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7fd66cc36f40>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/initools/
-WARNING: Retrying (Retry(total=0, connect=None, read=None, redirect=None, status=None)) after connection broken by 'NewConnectionError('<pip._vendor.urllib3.connection.VerifiedHTTPSConnection object at 0x7fd66be48100>: Failed to establish a new connection: [Errno -2] Name or service not known')': /simple/initools/
-ERROR: Could not find a version that satisfies the requirement INITools==0.1 (from versions: none)
-ERROR: No matching distribution found for INITools==0.1
----
- tests/functional/test_freeze.py          | 3 +++
- tests/functional/test_install.py         | 1 +
- tests/functional/test_install_config.py  | 1 +
- tests/functional/test_install_upgrade.py | 1 +
- 4 files changed, 6 insertions(+)
-
-diff --git a/tests/functional/test_freeze.py b/tests/functional/test_freeze.py
-index 546a482..aabb0ca 100644
---- a/tests/functional/test_freeze.py
-+++ b/tests/functional/test_freeze.py
-@@ -705,6 +705,7 @@ def test_freeze_user(script, virtualenv, data):
-     assert 'simple2' not in result.stdout
- 
- 
-+@pytest.mark.network
- def test_freeze_path(tmpdir, script, data):
-     """
-     Test freeze with --path.
-@@ -718,6 +719,7 @@ def test_freeze_path(tmpdir, script, data):
-     _check_output(result.stdout, expected)
- 
- 
-+@pytest.mark.network
- def test_freeze_path_exclude_user(tmpdir, script, data):
-     """
-     Test freeze with --path and make sure packages from --user are not picked
-@@ -739,6 +741,7 @@ def test_freeze_path_exclude_user(tmpdir, script, data):
-     _check_output(result.stdout, expected)
- 
- 
-+@pytest.mark.network
- def test_freeze_path_multiple(tmpdir, script, data):
-     """
-     Test freeze with multiple --path arguments.
-diff --git a/tests/functional/test_install.py b/tests/functional/test_install.py
-index 0bea054..b816df6 100644
---- a/tests/functional/test_install.py
-+++ b/tests/functional/test_install.py
-@@ -1274,6 +1274,7 @@ def test_install_no_binary_disables_building_wheels(script, data, with_wheel):
-     assert "Running setup.py install for upper" in str(res), str(res)
- 
- 
-+@pytest.mark.network
- def test_install_no_binary_builds_pep_517_wheel(script, data, with_wheel):
-     to_install = data.packages.joinpath('pep517_setup_and_pyproject')
-     res = script.pip(
-diff --git a/tests/functional/test_install_config.py b/tests/functional/test_install_config.py
-index bcf83f1..c9c60a2 100644
---- a/tests/functional/test_install_config.py
-+++ b/tests/functional/test_install_config.py
-@@ -133,6 +133,7 @@ def test_command_line_appends_correctly(script, data):
-     ), 'stdout: {}'.format(result.stdout)
- 
- 
-+@pytest.mark.network
- def test_config_file_override_stack(script, virtualenv):
-     """
-     Test config files (global, overriding a global config with a
-diff --git a/tests/functional/test_install_upgrade.py b/tests/functional/test_install_upgrade.py
-index 36b518b..c34a961 100644
---- a/tests/functional/test_install_upgrade.py
-+++ b/tests/functional/test_install_upgrade.py
-@@ -8,6 +8,7 @@ from tests.lib import assert_all_changes, pyversion
- from tests.lib.local_repos import local_checkout
- 
- 
-+@pytest.mark.network
- def test_no_upgrade_unless_requested(script):
-     """
-     No upgrade if not specifically requested.
--- 
-2.20.1
-

nowarn-pip._internal.main.patch

@@ -1,72 +0,0 @@
-From 7c36cb21910b415e0eb171d0f6c4dbf72382fdaf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
-Date: Tue, 10 Mar 2020 11:03:22 +0100
-Subject: [PATCH] Don't warn the user about pip._internal.main() entrypoint
-
-In Fedora, we use that in ensurepip and users cannot do anything about it,
-this warning is juts moot. Also, the warning breaks CPython test suite.
----
- src/pip/_internal/__init__.py          |  2 +-
- src/pip/_internal/utils/entrypoints.py | 19 ++++++++++---------
- tests/functional/test_cli.py           |  3 ++-
- 3 files changed, 13 insertions(+), 11 deletions(-)
-
-diff --git a/src/pip/_internal/__init__.py b/src/pip/_internal/__init__.py
-index 3aa8a46..0ec017b 100755
---- a/src/pip/_internal/__init__.py
-+++ b/src/pip/_internal/__init__.py
-@@ -15,4 +15,4 @@ def main(args=None):
-     """
-     from pip._internal.utils.entrypoints import _wrapper
- 
--    return _wrapper(args)
-+    return _wrapper(args, _nowarn=True)
-diff --git a/src/pip/_internal/utils/entrypoints.py b/src/pip/_internal/utils/entrypoints.py
-index befd01c..d6f3632 100644
---- a/src/pip/_internal/utils/entrypoints.py
-+++ b/src/pip/_internal/utils/entrypoints.py
-@@ -7,7 +7,7 @@ if MYPY_CHECK_RUNNING:
-     from typing import Optional, List
- 
- 
--def _wrapper(args=None):
-+def _wrapper(args=None, _nowarn=False):
-     # type: (Optional[List[str]]) -> int
-     """Central wrapper for all old entrypoints.
- 
-@@ -20,12 +20,13 @@ def _wrapper(args=None):
-     directing them to an appropriate place for help, we now define all of
-     our old entrypoints as wrappers for the current one.
-     """
--    sys.stderr.write(
--        "WARNING: pip is being invoked by an old script wrapper. This will "
--        "fail in a future version of pip.\n"
--        "Please see https://github.com/pypa/pip/issues/5599 for advice on "
--        "fixing the underlying issue.\n"
--        "To avoid this problem you can invoke Python with '-m pip' instead of "
--        "running pip directly.\n"
--    )
-+    if not _nowarn:
-+        sys.stderr.write(
-+            "WARNING: pip is being invoked by an old script wrapper. This will "
-+            "fail in a future version of pip.\n"
-+            "Please see https://github.com/pypa/pip/issues/5599 for advice on "
-+            "fixing the underlying issue.\n"
-+            "To avoid this problem you can invoke Python with '-m pip' instead of "
-+            "running pip directly.\n"
-+        )
-     return main(args)
-diff --git a/tests/functional/test_cli.py b/tests/functional/test_cli.py
-index e416315..7f57f67 100644
---- a/tests/functional/test_cli.py
-+++ b/tests/functional/test_cli.py
-@@ -31,4 +31,5 @@ def test_entrypoints_work(entrypoint, script):
-     result = script.pip("-V")
-     result2 = script.run("fake_pip", "-V", allow_stderr_warning=True)
-     assert result.stdout == result2.stdout
--    assert "old script wrapper" in result2.stderr
-+    if entrypoint[0] != "fake_pip = pip._internal:main":
-+        assert "old script wrapper" in result2.stderr
--- 
-2.24.1
-

pip-1.5rc1-allow-stripping-prefix-from-wheel-RECORD-files.patch

@@ -0,0 +1,99 @@
+commit aefacbb76661520415a1c35028f2984e70cfe0bf
+Author: Slavek Kabrda <bkabrda@redhat.com>
+Date:   Fri Nov 29 13:24:58 2013 +0100
+
+    Allow stripping given prefix from wheel RECORD files
+
+diff --git a/pip/commands/install.py b/pip/commands/install.py
+index 1693d01..0287c06 100644
+--- a/pip/commands/install.py
++++ b/pip/commands/install.py
+@@ -137,6 +137,14 @@ class InstallCommand(Command):
+                  "directory.")
+ 
+         cmd_opts.add_option(
++            '--strip-file-prefix',
++            dest='strip_file_prefix',
++            metavar='prefix',
++            default=None,
++            help="Strip given prefix from script paths in wheel RECORD."
++        )
++
++        cmd_opts.add_option(
+             "--compile",
+             action="store_true",
+             dest="compile",
+@@ -345,6 +353,7 @@ class InstallCommand(Command):
+                             install_options,
+                             global_options,
+                             root=options.root_path,
++                            strip_file_prefix=options.strip_file_prefix,
+                         )
+                         reqs = sorted(
+                             requirement_set.successfully_installed,
+
+diff --git a/pip/req/req_install.py b/pip/req/req_install.py
+index 3ae306d..c171130 100644
+--- a/pip/req/req_install.py
++++ b/pip/req/req_install.py
+@@ -615,15 +615,19 @@ exec(compile(open(__file__).read().replace('\\r\\n', '\\n'), __file__, 'exec'))
+         else:
+             return True
+ 
+-    def install(self, install_options, global_options=[], root=None):
++    def install(self, install_options, global_options=[], root=None, strip_file_prefix=None):
+         if self.editable:
+             self.install_editable(install_options, global_options)
+             return
+         if self.is_wheel:
+             version = pip.wheel.wheel_version(self.source_dir)
+             pip.wheel.check_compatibility(version, self.name)
+ 
+-            self.move_wheel_files(self.source_dir, root=root)
++            self.move_wheel_files(
++                self.source_dir,
++                root=root,
++                strip_file_prefix=strip_file_prefix
++            )
+             self.install_succeeded = True
+             return
+ 
+@@ -844,14 +848,15 @@ exec(compile(open(__file__).read().replace('\\r\\n', '\\n'), __file__, 'exec'))
+     def is_wheel(self):
+         return self.link and self.link.is_wheel
+ 
+-    def move_wheel_files(self, wheeldir, root=None):
++    def move_wheel_files(self, wheeldir, root=None, strip_file_prefix=None):
+         move_wheel_files(
+             self.name, self.req, wheeldir,
+             user=self.use_user_site,
+             home=self.target_dir,
+             root=root,
+             pycompile=self.pycompile,
+             isolated=self.isolated,
++            strip_file_prefix=strip_file_prefix,
+         )
+ 
+     def get_dist(self):
+diff --git a/pip/wheel.py b/pip/wheel.py
+index fa3e270..3a366d0 100644
+--- a/pip/wheel.py
++++ b/pip/wheel.py
+@@ -136,7 +136,7 @@ def get_entrypoints(filename):
+ 
+ 
+ def move_wheel_files(name, req, wheeldir, user=False, home=None, root=None,
+-                     pycompile=True, scheme=None, isolated=False):
++                     pycompile=True, scheme=None, isolated=False, strip_file_prefix=None):
+     """Install a wheel"""
+ 
+     if not scheme:
+@@ -357,6 +357,8 @@ if __name__ == '__main__':
+                 writer.writerow(row)
+             for f in generated:
+                 h, l = rehash(f)
++                if strip_file_prefix and f.startswith(strip_file_prefix):
++                    f = os.path.join(os.sep, os.path.relpath(f, strip_file_prefix))
+                 writer.writerow((f, h, l))
+             for f in installed:
+                 writer.writerow((installed[f], '', ''))

pip-allow-different-versions.patch

@@ -1,27 +0,0 @@
---- /usr/bin/pip3	2019-11-12 17:37:34.793131862 +0100
-+++ pip3	2019-11-12 17:40:42.014107134 +0100
-@@ -2,7 +2,23 @@
- # -*- coding: utf-8 -*-
- import re
- import sys
--from pip._internal.cli.main import main
-+
-+try:
-+    from pip._internal.cli.main import main
-+except ImportError:
-+    try:
-+        from pip._internal.main import main
-+    except ImportError:
-+        try:
-+            # If the user has downgraded pip, the above import will fail.
-+            # Let's try older methods of invoking it:
-+
-+            # pip 19 uses this
-+            from pip._internal import main
-+        except ImportError:
-+            # older pip versions use this
-+            from pip import main
-+
- if __name__ == '__main__':
-     sys.argv[0] = re.sub(r'(-script\.pyw|\.exe)?$', '', sys.argv[0])
-     sys.exit(main())

python-pip.rpmlintrc

@@ -1,15 +0,0 @@
-# This is just temporary, when upstream merges PRs it can be removed
-# https://github.com/pypa/pip/pull/7959
-# https://github.com/ActiveState/appdirs/pull/144
-# https://github.com/psf/requests/pull/5410
-# https://github.com/chardet/chardet/pull/192
-addFilter(r'(non-executable-script|wrong-script-interpreter) .+/pip/_internal/__init__.py\b')
-addFilter(r'(non-executable-script|wrong-script-interpreter) .+/pip/_vendor/appdirs.py\b')
-addFilter(r'(non-executable-script|wrong-script-interpreter) .+/pip/_vendor/requests/certs.py\b')
-addFilter(r'(non-executable-script|wrong-script-interpreter) .+/pip/_vendor/chardet/cli/chardetect.py\b')
-
-# We ship README with the main package but not with the wheel
-addFilter(r'python-pip-wheel.noarch: W: no-documentation')
-
-# SPELLING ERRORS
-addFilter(r'W: spelling-error .* venv')

python-pip.spec

@@ -1,625 +1,239 @@
-%bcond_without tests
-
-%bcond_without doc
+%if (! 0%{?rhel}) || 0%{?rhel} > 5
+%global with_python3 1
+%global build_wheel 0
+%global with_tests 0
+%endif
+%if 0%{?rhel} && 0%{?rhel} < 6
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
+%endif
 
 %global srcname pip
-%global base_version 20.1.1
-%global upstream_version %{base_version}%{?prerel}
-%global python_wheelname %{srcname}-%{upstream_version}-py2.py3-none-any.whl
-%global python_wheeldir %{_datadir}/python-wheels
-
-%if %{with doc}
-%global pypa_theme_commit_hash d2e63fbfc62af3b7050f619b2f5bb8658985b931
+%if 0%{?build_wheel}
+%global python2_wheelname %{srcname}-%{version}-py2.py3-none-any.whl
+%if 0%{?with_python3}
+%global python3_wheelname %python2_wheelname
+%endif
 %endif
 
-%global bashcompdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null)
+%global bashcompdir %(b=$(pkg-config --variable=completionsdir bash-completion 2>/dev/null); echo ${b:-%{_sysconfdir}/bash_completion.d})
+%if "%{bashcompdir}" != "%{_sysconfdir}/bash_completion.d"
+%global bashcomp2 1
+%endif
 
 Name:           python-%{srcname}
-# When updating, update the bundled libraries versions bellow!
-# You can use vendor_meta.sh in the dist git repo
-Version:        %{base_version}%{?prerel:~%{prerel}}
-Release:        6%{?dist}
+Version:        7.1.0
+Release:        2%{?dist}
 Summary:        A tool for installing and managing Python packages
 
-# We bundle a lot of libraries with pip, which itself is under MIT license.
-# Here is the list of the libraries with corresponding licenses:
+Group:          Development/Libraries
+License:        MIT
+URL:            http://www.pip-installer.org
+Source0:        http://pypi.python.org/packages/source/p/pip/%{srcname}-%{version}.tar.gz
 
-# appdirs: MIT
-# certifi: MPLv2.0
-# chardet: LGPLv2
-# colorama: BSD
-# CacheControl: ASL 2.0
-# contextlib2: Python
-# distlib: Python
-# distro: ASL 2.0
-# html5lib: MIT
-# idna: BSD
-# ipaddress: Python
-# msgpack: ASL 2.0
-# packaging: ASL 2.0 or BSD
-# pep517: MIT
-# progress: ISC
-# pyparsing: MIT
-# pytoml: MIT
-# requests: ASL 2.0
-# retrying: ASL 2.0
-# setuptools: MIT
-# six: MIT
-# urllib3: MIT
-# webencodings: BSD
+# to get tests:
+# git clone https://github.com/pypa/pip && cd fig
+# git checkout 1.5.6 && tar -czvf pip-1.5.6-tests.tar.gz tests/
+%if 0%{?with_tests}
+Source1:        pip-6.0.8-tests.tar.gz
+%endif
 
-License:        MIT and Python and ASL 2.0 and BSD and ISC and LGPLv2 and MPLv2.0 and (ASL 2.0 or BSD)
-URL:            https://pip.pypa.io/
-Source0:        https://github.com/pypa/pip/archive/%{upstream_version}/%{srcname}-%{upstream_version}.tar.gz
+Patch0:         pip-1.5rc1-allow-stripping-prefix-from-wheel-RECORD-files.patch
+
+BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 
 BuildArch:      noarch
-
-%if %{with tests}
-BuildRequires:  /usr/bin/git
-BuildRequires:  /usr/bin/bzr
-BuildRequires:  /usr/bin/svn
-BuildRequires:  python-setuptools-wheel
-BuildRequires:  python-wheel-wheel
+BuildRequires:  python-devel
+BuildRequires:  python-setuptools
+%if 0%{?with_tests}
+BuildRequires:  python-mock
+BuildRequires:  pytest
+BuildRequires:  python-pretend
+BuildRequires:  python-freezegun
+BuildRequires:  python-scripttest
+BuildRequires:  python-virtualenv
 %endif
-
-# Themes required to build the docs.
-%if %{with doc}
-Source1:        https://github.com/pypa/pypa-docs-theme/archive/%{pypa_theme_commit_hash}.tar.gz
-Source2:        https://github.com/python/python-docs-theme/archive/2018.2.tar.gz
+%if 0%{?build_wheel}
+BuildRequires:  python-pip
+BuildRequires:  python-wheel
 %endif
-
-# Downstream only patch
-# Emit a warning to the user if pip install is run with root privileges
-# Issue upstream: https://github.com/pypa/pip/issues/4288
-Patch1:         emit-a-warning-when-running-with-root-privileges.patch
-
-# Add path to the doc themes to conf.py
-Patch2:         html_theme_path.patch
-
-# Prevent removing of the system packages installed under /usr/lib
-# when pip install -U is executed.
-# https://bugzilla.redhat.com/show_bug.cgi?id=1550368#c24
-Patch3:         remove-existing-dist-only-if-path-conflicts.patch
-
-# Use the system level root certificate instead of the one bundled in certifi
-# https://bugzilla.redhat.com/show_bug.cgi?id=1655253
-Patch4:         dummy-certifi.patch
-
-# Don't warn the user about pip._internal.main() entrypoint
-# In Fedora, we use that in ensurepip and users cannot do anything about it,
-# this warning is juts moot. Also, the warning breaks CPython test suite.
-Patch5:         nowarn-pip._internal.main.patch
-
-# Backport: Update tests to be endian safe
-# This updates `test_path_to_display` and `test_str_to_display__encoding`
-# to use the endian safe expected result instead of the hardcoded one.
-# This fixes https://github.com/pypa/pip/issues/7921
-Patch6:         https://github.com/pypa/pip/commit/b30dd1e04e.patch
-
-# Downstream only patch
-# Users might have local installations of pip from using
-# `pip install --user --upgrade pip` on older/newer versions.
-# If they do that and they run `pip` or  `pip3`, the one from /usr/bin is used.
-# However that's the one from this RPM package and the import in there might
-# fail (it tries to import from ~/.local, but older or newer pip is there with
-# a bit different API).
-# We add this patch as a dirty workaround to make /usr/bin/pip* work with
-# both pip10+ (from this RPM) and older or newer (19.3+) pip (from whatever).
-# A proper fix is to put ~/.local/bin in front of /usr/bin in the PATH,
-# however others are against that and we cannot change it for existing
-# installs/user homes anyway.
-# https://bugzilla.redhat.com/show_bug.cgi?id=1569488
-# https://bugzilla.redhat.com/show_bug.cgi?id=1571650
-# https://bugzilla.redhat.com/show_bug.cgi?id=1767212
-# WARNING: /usr/bin/pip* are entrypoints, this cannot be applied in %%prep!
-# %%patch10 doesn't work outside of %%prep, so we add it as a source
-# Note that since pip 20, old main() import paths are preserved for backwards
-# compatibility: https://github.com/pypa/pip/issues/7498
-# Meaning we don't need to update any of the older pips to support 20+
-# We also don't need to update Pythons to use new import path in ensurepip
-Source10:        pip-allow-different-versions.patch
+Requires:       python-setuptools
 
 %description
-pip is a package management system used to install and manage software packages
-written in Python. Many packages can be found in the Python Package Index
-(PyPI). pip is a recursive acronym that can stand for either "Pip Installs
-Packages" or "Pip Installs Python".
+Pip is a replacement for `easy_install
+<http://peak.telecommunity.com/DevCenter/EasyInstall>`_.  It uses mostly the
+same techniques for finding packages, so packages that were made
+easy_installable should be pip-installable as well.
 
 
-
-# Virtual provides for the packages bundled by pip.
-# You can generate it with:
-# %%{_rpmconfigdir}/pythonbundles.py --namespace 'python%%{1}dist' src/pip/_vendor/vendor.txt
-%global bundled() %{expand:
-Provides: bundled(python%{1}dist(appdirs)) = 1.4.3
-Provides: bundled(python%{1}dist(cachecontrol)) = 0.12.6
-Provides: bundled(python%{1}dist(certifi)) = 2020.4.5.1
-Provides: bundled(python%{1}dist(chardet)) = 3.0.4
-Provides: bundled(python%{1}dist(colorama)) = 0.4.3
-Provides: bundled(python%{1}dist(contextlib2)) = 0.6^post1
-Provides: bundled(python%{1}dist(distlib)) = 0.3
-Provides: bundled(python%{1}dist(distro)) = 1.5
-Provides: bundled(python%{1}dist(html5lib)) = 1.0.1
-Provides: bundled(python%{1}dist(idna)) = 2.9
-Provides: bundled(python%{1}dist(ipaddress)) = 1.0.23
-Provides: bundled(python%{1}dist(msgpack)) = 1
-Provides: bundled(python%{1}dist(packaging)) = 20.3
-Provides: bundled(python%{1}dist(pep517)) = 0.8.2
-Provides: bundled(python%{1}dist(progress)) = 1.5
-Provides: bundled(python%{1}dist(pyparsing)) = 2.4.7
-Provides: bundled(python%{1}dist(requests)) = 2.23
-Provides: bundled(python%{1}dist(resolvelib)) = 0.3
-Provides: bundled(python%{1}dist(retrying)) = 1.3.3
-Provides: bundled(python%{1}dist(setuptools)) = 44
-Provides: bundled(python%{1}dist(six)) = 1.14
-Provides: bundled(python%{1}dist(toml)) = 0.10
-Provides: bundled(python%{1}dist(urllib3)) = 1.25.8
-Provides: bundled(python%{1}dist(webencodings)) = 0.5.1
-}
-
-# Some manylinux1 wheels need libcrypt.so.1.
-# Manylinux1, a common (as of 2019) platform tag for binary wheels, relies
-# on a glibc version that included ancient crypto functions, which were
-# moved to libxcrypt and then removed in:
-#  https://fedoraproject.org/wiki/Changes/FullyRemoveDeprecatedAndUnsafeFunctionsFromLibcrypt
-# The manylinux1 standard assumed glibc would keep ABI compatibility,
-# but that's only the case if libcrypt.so.1 (libxcrypt-compat) is around.
-# This should be solved in the next manylinux standard (but it may be
-# a long time until manylinux1 is phased out).
-# See: https://github.com/pypa/manylinux/issues/305
-# Note that manylinux is only applicable to x86 (both 32 and 64 bits)
-%global crypt_compat_recommends() %{expand:
-Recommends: (libcrypt.so.1()(64bit) if python%{1}(x86-64))
-Recommends: (libcrypt.so.1 if python%{1}(x86-32))
-}
-
-
-
-%package -n python%{python3_pkgversion}-%{srcname}
+%if 0%{?with_python3}
+%package -n python%{python3_pkgversion}-pip
 Summary:        A tool for installing and managing Python3 packages
+Group:          Development/Libraries
 
 BuildRequires:  python%{python3_pkgversion}-devel
-# python3 bootstrap: this is rebuilt before the final build of python3, which
-# adds the dependency on python3-rpm-generators, so we require it manually
-# Note that the package prefix is always python3-, even if we build for 3.X
-# The minimal version is for bundled provides verification script
-BuildRequires:  python3-rpm-generators >= 11-8
 BuildRequires:  python%{python3_pkgversion}-setuptools
 BuildRequires:  bash-completion
-%if %{with tests}
+%if 0%{?with_tests}
 BuildRequires:  python%{python3_pkgversion}-mock
 BuildRequires:  python%{python3_pkgversion}-pytest
 BuildRequires:  python%{python3_pkgversion}-pretend
 BuildRequires:  python%{python3_pkgversion}-freezegun
 BuildRequires:  python%{python3_pkgversion}-scripttest
 BuildRequires:  python%{python3_pkgversion}-virtualenv
-BuildRequires:  python%{python3_pkgversion}-werkzeug
-BuildRequires:  python%{python3_pkgversion}-pyyaml
 %endif
+%if 0%{?build_wheel}
+BuildRequires:  python%{python3_pkgversion}-pip
 BuildRequires:  python%{python3_pkgversion}-wheel
-BuildRequires:  ca-certificates
-Requires:       ca-certificates
-
-# This was previously required and we keep it recommended because a lot of
-# sdists installed via pip will try to import setuptools.
-# But pip doesn't actually require setuptools.
-# It can install wheels without them and it can build wheels in isolation mode
-# (using setuptools/flit/poetry/... installed from PyPI).
-# Side note: pip bundles pkg_resources from setuptools for internal usage.
-Recommends:     python%{python3_pkgversion}-setuptools
-
-# Virtual provides for the packages bundled by pip:
-%{bundled 3}
-
-Provides:       pip = %{version}-%{release}
-Conflicts:      python-pip < %{version}-%{release}
-
-%{crypt_compat_recommends 3}
-
-%description -n python%{python3_pkgversion}-%{srcname}
-pip is a package management system used to install and manage software packages
-written in Python. Many packages can be found in the Python Package Index
-(PyPI). pip is a recursive acronym that can stand for either "Pip Installs
-Packages" or "Pip Installs Python".
-
-%if %{with doc}
-%package doc
-Summary:        A documentation for a tool for installing and managing Python packages
-
-BuildRequires:  python%{python3_pkgversion}-sphinx
-
-%description doc
-A documentation for a tool for installing and managing Python packages
-
 %endif
+Requires:  python%{python3_pkgversion}-setuptools
 
-%package wheel
-Summary:        The pip wheel
-Requires:       ca-certificates
-
-# Virtual provides for the packages bundled by pip:
-%{bundled 2}
-%{bundled 3}
-
-%{crypt_compat_recommends 2}
-%{crypt_compat_recommends 3}
-
-%description wheel
-A Python wheel of pip to use with venv.
+%description -n python%{python3_pkgversion}-pip
+Pip is a replacement for `easy_install
+<http://peak.telecommunity.com/DevCenter/EasyInstall>`_.  It uses mostly the
+same techniques for finding packages, so packages that were made
+easy_installable should be pip-installable as well.
+%endif # with_python3
 
 %prep
-%setup -q -n %{srcname}-%{upstream_version}
-
-%if %{with doc}
-pushd docs/html
+%setup -q -n %{srcname}-%{version}
+%if 0%{?with_tests}
 tar -xf %{SOURCE1}
-mv pypa-docs-theme-%{pypa_theme_commit_hash} pypa
-tar -xf %{SOURCE2}
-mv python-docs-theme-2018.2 python-docs-theme
-popd
 %endif
 
-%autopatch -p1
+%patch0 -p1
 
-# this goes together with patch4
-rm src/pip/_vendor/certifi/*.pem
+%{__sed} -i '1d' pip/__init__.py
 
-# tests expect wheels in here
-ln -s %{python_wheeldir} tests/data/common_wheels
-
-# Upstream uses a Python 2/3 compatibility library for csv with Python 3 semantics in tests
-# We only target Python 3 and csv23 is not (yet) packaged
-# As of 20.1b1, this workaround was sufficient to get around the missing dependency
-sed -i -e 's/csv23/csv/g' tests/lib/wheel.py
+%if 0%{?with_python3}
+cp -a . %{py3dir}
+%endif # with_python3
 
 
 %build
-%py3_build_wheel
-
-%if %{with doc}
-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 -rf docs/build/html/{.doctrees,.buildinfo}
+%if 0%{?build_wheel}
+%{__python} setup.py bdist_wheel
+%else
+%{__python} setup.py build
 %endif
 
+%if 0%{?with_python3}
+pushd %{py3dir}
+%if 0%{?build_wheel}
+%{__python3} setup.py bdist_wheel
+%else
+%{__python3} setup.py build
+%endif
+popd
+%endif # with_python3
+
 
 %install
-# The following is similar to %%py3_install_wheel, but we don't have
-# /usr/bin/pip yet, so we install using the wheel directly.
-# (This is not standard wheel usage, but the pip wheel supports it -- see
-#  pip/__main__.py)
-%{__python3} dist/%{python_wheelname}/pip install \
-    --root %{buildroot} \
-    --no-deps \
-    --no-cache-dir \
-    --no-index \
-    --ignore-installed \
-    --find-links dist \
-    'pip==%{upstream_version}'
+%{__rm} -rf %{buildroot}
 
-%if %{with doc}
-pushd docs/build/man
-install -d %{buildroot}%{_mandir}/man1
-for MAN in *1; do
-install -pm0644 $MAN %{buildroot}%{_mandir}/man1/$MAN
-for pip in "pip3" "pip-3" "pip%{python3_version}" "pip-%{python3_version}"; do
-echo ".so $MAN" > %{buildroot}%{_mandir}/man1/${MAN/pip/$pip}
-done
+%if 0%{?with_python3}
+pushd %{py3dir}
+%if 0%{?build_wheel}
+pip3 install -I dist/%{python3_wheelname} --root %{buildroot} --strip-file-prefix %{buildroot}
+# TODO: we have to remove this by hand now, but it'd be nice if we wouldn't have to
+# (pip install wheel doesn't overwrite)
+rm %{buildroot}%{_bindir}/pip
+%else
+%{__python3} setup.py install --skip-build --root %{buildroot}
+%endif
+%endif # with_python3
+
+%if 0%{?build_wheel}
+pip2 install -I dist/%{python2_wheelname} --root %{buildroot} --strip-file-prefix %{buildroot}
+%else
+%{__python} setup.py install -O1 --skip-build --root %{buildroot}
+%endif
+
+mkdir -p %{buildroot}%{bashcompdir}
+PYTHONPATH=%{buildroot}%{python_sitelib} \
+    %{buildroot}%{_bindir}/pip completion --bash \
+    > %{buildroot}%{bashcompdir}/pip
+%if 0%{?with_python3}
+PYTHONPATH=%{buildroot}%{python3_sitelib} \
+    %{buildroot}%{_bindir}/pip3 completion --bash \
+    > %{buildroot}%{bashcompdir}/pip3
+%endif
+pips2=pip
+pips3=pip3
+for pip in %{buildroot}%{_bindir}/pip*; do
+    pip=$(basename $pip)
+    case $pip in
+        pip2*)
+            pips2="$pips2 $pip"
+%if 0%{?bashcomp2}
+            ln -s pip %{buildroot}%{bashcompdir}/$pip
+%endif
+            ;;
+%if 0%{?with_python3}
+        pip3?*)
+            pips3="$pips3 $pip"
+%if 0%{?bashcomp2}
+            ln -s pip3 %{buildroot}%{bashcompdir}/$pip
+%endif
+            ;;
+%endif
+    esac
 done
+%if 0%{?with_python3}
+sed -i -e "s/^\\(complete.*\\) pip\$/\\1 $pips3/" \
+    -e s/_pip_completion/_pip3_completion/ \
+    %{buildroot}%{bashcompdir}/pip3
+%endif
+sed -i -e "s/^\\(complete.*\\) pip\$/\\1 $pips2/" \
+    %{buildroot}%{bashcompdir}/pip
+
+%if 0%{?with_tests}
+%check
+py.test -m 'not network'
+pushd %{py3dir}
+py.test-3.4 -m 'not network'
 popd
 %endif
 
-# before we ln -s anything, we apply Source10 patch to all pips:
-for PIP in %{buildroot}%{_bindir}/pip*; do
-  patch -p1 --no-backup-if-mismatch $PIP < %{SOURCE10}
-done
 
-mkdir -p %{buildroot}%{bashcompdir}
-PYTHONPATH=%{buildroot}%{python3_sitelib} \
-    %{buildroot}%{_bindir}/pip completion --bash \
-    > %{buildroot}%{bashcompdir}/pip3
+%clean
+%{__rm} -rf %{buildroot}
 
-# Make bash completion apply to all the 5 symlinks we install
-sed -i -e "s/^\\(complete.*\\) pip\$/\\1 pip pip{,-}{3,%{python3_version}}/" \
-    -e s/_pip_completion/_pip3_completion/ \
-    %{buildroot}%{bashcompdir}/pip3
+# unfortunately, pip's test suite requires virtualenv >= 1.6 which isn't in
+# fedora yet. Once it is, check can be implemented
 
-
-# Provide symlinks to executables to comply with Fedora guidelines for Python
-ln -s ./pip%{python3_version} %{buildroot}%{_bindir}/pip-%{python3_version}
-ln -s ./pip-%{python3_version} %{buildroot}%{_bindir}/pip-3
-
-
-# Make sure the INSTALLER is not pip, otherwise Patch2 won't work
-# %%pyproject macros do this for all packages
-echo rpm > %{buildroot}%{python3_sitelib}/pip-%{upstream_version}.dist-info/INSTALLER
-
-mkdir -p %{buildroot}%{python_wheeldir}
-install -p dist/%{python_wheelname} -t %{buildroot}%{python_wheeldir}
-
-
-%if %{with tests}
-%check
-# Verify bundled provides are up to date
-%{_rpmconfigdir}/pythonbundles.py src/pip/_vendor/vendor.txt --compare-with '%{bundled 3}'
-
-# Upstream tests
-# bash completion tests only work from installed package
-# needs unaltered sys.path and we cannot do that in %%check
-#     test_pep517_and_build_options
-#     test_config_file_venv_option
-# TODO investigate failures
-#     test_uninstall_non_local_distutils
-# Incompatible with the latest virtualenv
-#     test_from_link_vcs_with_source_dir_obtains_commit_id
-#     test_from_link_vcs_without_source_dir
-#     test_should_cache_git_sha
-pytest_k='not completion and
-          not test_pep517_and_build_options and
-          not test_config_file_venv_option and
-          not test_uninstall_non_local_distutils and
-          not test_from_link_vcs_with_source_dir_obtains_commit_id and
-          not test_from_link_vcs_without_source_dir and
-          not test_should_cache_git_sha'
-
-# --deselect'ed tests are not compatible with the latest virtualenv
-# These files contain almost 500 tests so we should enable them back
-# as soon as pip will be compatible upstream
-# https://github.com/pypa/pip/pull/8441
-%pytest -m 'not network' -k "$(echo $pytest_k)" \
-    --deselect tests/functional --deselect tests/lib/test_lib.py --deselect tests/unit/test_build_env.py
-%endif
-
-
-%files -n python%{python3_pkgversion}-%{srcname}
+%files
+%defattr(-,root,root,-)
+%{!?_licensedir:%global license %%doc}
 %license LICENSE.txt
-%doc README.rst
-%if %{with doc}
-%{_mandir}/man1/pip.*
-%{_mandir}/man1/pip-*.*
-%{_mandir}/man1/pip3.*
-%{_mandir}/man1/pip3-*.*
+%doc README.rst docs
+%attr(755,root,root) %{_bindir}/pip
+%attr(755,root,root) %{_bindir}/pip2*
+%{python_sitelib}/pip*
+%{bashcompdir}
+%if 0%{?with_python3}
+%exclude %{bashcompdir}/pip3*
 %endif
-%{_bindir}/pip
-%{_bindir}/pip3
-%{_bindir}/pip-3
-%{_bindir}/pip%{python3_version}
-%{_bindir}/pip-%{python3_version}
+%if 0%{?bashcomp2}
+%dir %(dirname %{bashcompdir})
+%endif
+
+%if 0%{?with_python3}
+%files -n python%{python3_pkgversion}-pip
+%defattr(-,root,root,-)
+%license LICENSE.txt
+%doc README.rst docs
+%attr(755,root,root) %{_bindir}/pip3*
 %{python3_sitelib}/pip*
 %dir %{bashcompdir}
-%{bashcompdir}/pip3
-
-%if %{with doc}
-%files doc
-%license LICENSE.txt
-%doc README.rst
-%doc docs/build/html
+%{bashcompdir}/pip3*
+%if 0%{?bashcomp2}
+%dir %(dirname %{bashcompdir})
 %endif
-
-%files wheel
-%license LICENSE.txt
-# we own the dir for simplicity
-%dir %{python_wheeldir}/
-%{python_wheeldir}/%{python_wheelname}
+%endif # with_python3
 
 %changelog
-* Fri Jul 10 2020 Lumír Balhar <lbalhar@redhat.com> - 20.1.1-6
-- Do not emit a warning about root privileges when --root is used
-
-* Wed Jul 08 2020 Miro Hrončok <mhroncok@redhat.com> - 20.1.1-5
-- Update bundled provides to match 20.1.1
-
-* Tue Jun 16 2020 Lumír Balhar <lbalhar@redhat.com> - 20.1.1-4
-- Deselect tests incompatible with the latest virtualenv
-
-* Sun May 24 2020 Miro Hrončok <mhroncok@redhat.com> - 20.1.1-3
-- Rebuilt for Python 3.9
-
-* Thu May 21 2020 Miro Hrončok <mhroncok@redhat.com> - 20.1.1-2
-- Bootstrap for Python 3.9
-
-* Wed May 20 2020 Tomas Hrnciar <thrnciar@redhat.com> - 20.1.1-1
-- Update to 20.1.1
-
-* Wed Apr 29 2020 Tomas Hrnciar <thrnciar@redhat.com> - 20.1-1
-- Update to 20.1
-
-* Mon Apr 27 2020 Tomas Hrnciar <thrnciar@redhat.com> - 20.1~b1-1
-- Update to 20.1~b1
-
-* Wed Apr 15 2020 Miro Hrončok <mhroncok@redhat.com> - 20.0.2-4
-- Only recommend setuptools, don't require them
-
-* Fri Apr 10 2020 Miro Hrončok <mhroncok@redhat.com> - 20.0.2-3
-- Allow setting $TMPDIR to $PWD/... during pip wheel (#1806625)
-
-* Tue Mar 10 2020 Miro Hrončok <mhroncok@redhat.com> - 20.0.2-2
-- Don't warn the user about pip._internal.main() entrypoint to fix ensurepip
-
-* Mon Mar 02 2020 Miro Hrončok <mhroncok@redhat.com> - 20.0.2-1
-- Update to 20.0.2 (#1793456)
-
-* Thu Jan 30 2020 Fedora Release Engineering <releng@fedoraproject.org> - 19.3.1-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
-
-* Mon Nov 04 2019 Tomas Orsava <torsava@redhat.com> - 19.3.1-1
-- Update to 19.3.1 (#1761508)
-- Drop upstreamed patch that fixed expected output in test to not break with alpha/beta/rc Python versions
-
-* Wed Oct 30 2019 Miro Hrončok <mhroncok@redhat.com> - 19.2.3-2
-- Make /usr/bin/pip(3) work with user-installed pip 19.3+ (#1767212)
-
-* Mon Sep 02 2019 Miro Hrončok <mhroncok@redhat.com> - 19.2.3-1
-- Update to 19.2.3 (#1742230)
-- Drop patch that should strip path prefixes from RECORD files, the paths are relative
-
-* Wed Aug 21 2019 Petr Viktorin <pviktori@redhat.com> - 19.1.1-8
-- Remove python2-pip
-- Make pip bootstrap itself, rather than with an extra bootstrap RPM build
-
-* Sat Aug 17 2019 Miro Hrončok <mhroncok@redhat.com> - 19.1.1-7
-- Rebuilt for Python 3.8
-
-* Wed Aug 14 2019 Miro Hrončok <mhroncok@redhat.com> - 19.1.1-6
-- Bootstrap for Python 3.8
-
-* Wed Aug 14 2019 Miro Hrončok <mhroncok@redhat.com> - 19.1.1-5
-- Bootstrap for Python 3.8
-
-* Fri Jul 26 2019 Fedora Release Engineering <releng@fedoraproject.org> - 19.1.1-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
-
-* Mon Jul 15 2019 Petr Viktorin <pviktori@redhat.com> - 19.1.1-3
-- Recommend libcrypt.so.1 for manylinux1 compatibility
-- Make /usr/bin/pip Python 3
-
-* Mon Jun 10 2019 Miro Hrončok <mhroncok@redhat.com> - 19.1.1-2
-- Fix root warning when pip is invoked via python -m pip
-- Remove a redundant second WARNING prefix form the abovementioned warning
-
-* Wed May 15 2019 Miro Hrončok <mhroncok@redhat.com> - 19.1.1-1
-- Update to 19.1.1 (#1706995)
-
-* 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)
-
-* Wed Feb 13 2019 Miro Hrončok <mhroncok@redhat.com> - 19.0.2-1
-- Update to 19.0.2 (#1668492)
-
-* Sat Feb 02 2019 Fedora Release Engineering <releng@fedoraproject.org> - 18.1-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
-
-* Mon Dec 03 2018 Miro Hrončok <mhroncok@redhat.com> - 18.1-2
-- Use the system level root certificate instead of the one bundled in certifi
-
-* 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.
-  Resolves: rhbz#1550368.
-
-* Wed Aug 08 2018 Miro Hrončok <mhroncok@redhat.com> - 18.0-3
-- Create python-pip-wheel package with the wheel
-
-* Tue Jul 31 2018 Miro Hrončok <mhroncok@redhat.com> - 18.0-2
-- Remove redundant "Unicode"" from License
-
-* Mon Jul 23 2018 Marcel Plch <mplch@redhat.com> - 18.0-7
-- Update to 18.0
-
-* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.3-6
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
-
-* Mon Jun 18 2018 Miro Hrončok <mhroncok@redhat.com> - 9.0.3-5
-- Rebuilt for Python 3.7
-
-* Wed Jun 13 2018 Miro Hrončok <mhroncok@redhat.com> - 9.0.3-4
-- Bootstrap for Python 3.7
-
-* Wed Jun 13 2018 Miro Hrončok <mhroncok@redhat.com> - 9.0.3-3
-- Bootstrap for Python 3.7
-
-* Fri May 04 2018 Miro Hrončok <mhroncok@redhat.com> - 9.0.3-2
-- Allow to import pip10's main from pip9's /usr/bin/pip
-- Do not show the "new version of pip" warning outside of venv
-Resolves: rhbz#1569488
-Resolves: rhbz#1571650
-Resolves: rhbz#1573755
-
-* Thu Mar 29 2018 Charalampos Stratakis <cstratak@redhat.com> - 9.0.3-1
-- Update to 9.0.3
-
-* Wed Feb 21 2018 Lumír Balhar <lbalhar@redhat.com> - 9.0.1-16
-- Include built HTML documentation (in the new -doc subpackage) and man page
-
-* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.1-15
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
-
-* Mon Dec 04 2017 Charalampos Stratakis <cstratak@redhat.com> - 9.0.1-14
-- Reintroduce the ipaddress module in the python3 subpackage.
-
-* Mon Nov 20 2017 Charalampos Stratakis <cstratak@redhat.com> - 9.0.1-13
-- Add virtual provides for the bundled libraries. (rhbz#1096912)
-
-* Tue Aug 29 2017 Tomas Orsava <torsava@redhat.com> - 9.0.1-12
-- Switch macros to bcond's and make Python 2 optional to facilitate building
-  the Python 2 and Python 3 modules
-
-* Thu Jul 27 2017 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.1-11
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild
-
-* Tue May 23 2017 Tomas Orsava <torsava@redhat.com> - 9.0.1-10
-- Modernized package descriptions
-Resolves: rhbz#1452568
-
-* Tue Mar 21 2017 Tomas Orsava <torsava@redhat.com> - 9.0.1-9
-- Fix typo in the sudo pip warning
-
-* Fri Mar 03 2017 Tomas Orsava <torsava@redhat.com> - 9.0.1-8
-- Patch 1 update: No sudo pip warning in venv or virtualenv
-
-* Thu Feb 23 2017 Tomas Orsava <torsava@redhat.com> - 9.0.1-7
-- Patch 1 update: Customize the warning with the proper version of the pip
-  command
-
-* Tue Feb 14 2017 Tomas Orsava <torsava@redhat.com> - 9.0.1-6
-- Added patch 1: Emit a warning when running with root privileges
-
-* Sat Feb 11 2017 Fedora Release Engineering <releng@fedoraproject.org> - 9.0.1-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_26_Mass_Rebuild
-
-* Mon Jan 02 2017 Tomas Orsava <torsava@redhat.com> - 9.0.1-4
-- Provide symlinks to executables to comply with Fedora guidelines for Python
-Resolves: rhbz#1406922
-
-* Fri Dec 09 2016 Charalampos Stratakis <cstratak@redhat.com> - 9.0.1-3
-- Rebuild for Python 3.6 with wheel
-
-* Fri Dec 09 2016 Charalampos Stratakis <cstratak@redhat.com> - 9.0.1-2
-- Rebuild for Python 3.6 without wheel
-
-* Fri Nov 18 2016 Orion Poplawski <orion@cora.nwra.com> - 9.0.1-1
-- Update to 9.0.1
-
-* Fri Nov 18 2016 Orion Poplawski <orion@cora.nwra.com> - 8.1.2-5
-- Enable EPEL Python 3 builds
-- Use new python macros
-- Cleanup spec
-
-* Fri Aug 05 2016 Tomas Orsava <torsava@redhat.com> - 8.1.2-4
-- Updated the test sources
-
-* Fri Aug 05 2016 Tomas Orsava <torsava@redhat.com> - 8.1.2-3
-- Moved python-pip into the python2-pip subpackage
-- Added the python_provide macro
-
-* Tue Jul 19 2016 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 8.1.2-2
-- https://fedoraproject.org/wiki/Changes/Automatic_Provides_for_Python_RPM_Packages
-
-* Tue May 17 2016 Tomas Orsava <torsava@redhat.com> - 8.1.2-1
-- Update to 8.1.2
-- Moved to a new PyPI URL format
-- Updated the prefix-stripping patch because of upstream changes in pip/wheel.py
-
-* Mon Feb 22 2016 Slavek Kabrda <bkabrda@redhat.com> - 8.0.2-1
-- Update to 8.0.2
-
-* Thu Feb 04 2016 Fedora Release Engineering <releng@fedoraproject.org> - 7.1.0-4
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_24_Mass_Rebuild
-
-* Wed Oct 14 2015 Robert Kuska <rkuska@redhat.com> - 7.1.0-3
-- Rebuilt for Python3.5 rebuild
-- With wheel set to 1
-
-* Tue Oct 13 2015 Robert Kuska <rkuska@redhat.com> - 7.1.0-2
-- Rebuilt for Python3.5 rebuild
+* Mon Nov 11 2019 Steve Traylen <steve.traylen@cern.ch> - 7.1.0-2
+- Create a python3(4) package.
 
 * Wed Jul 01 2015 Slavek Kabrda <bkabrda@redhat.com> - 7.1.0-1
 - Update to 7.1.0

remove-existing-dist-only-if-path-conflicts.patch

@@ -1,95 +0,0 @@
-From d381c59fdc15949c4dc293bd92bbccb60289a703 Mon Sep 17 00:00:00 2001
-From: Tomas Hrnciar <thrnciar@redhat.com>
-Date: Sun, 26 Apr 2020 21:19:03 +0200
-Subject: [PATCH] Prevent removing of the system packages installed under
- /usr/lib
-
-when pip install -U is executed.
-
-Resolves: rhbz#1550368
-
-Co-Authored-By: Michal Cyprian <m.cyprian@gmail.com>
-Co-Authored-By: Victor Stinner <vstinner@redhat.com>
----
- src/pip/_internal/req/req_install.py            |  3 ++-
- src/pip/_internal/resolution/legacy/resolver.py |  5 ++++-
- src/pip/_internal/utils/misc.py                 | 11 +++++++++++
- 3 files changed, 17 insertions(+), 2 deletions(-)
-
-diff --git a/src/pip/_internal/req/req_install.py b/src/pip/_internal/req/req_install.py
-index 3b28209b..d14217e9 100644
---- a/src/pip/_internal/req/req_install.py
-+++ b/src/pip/_internal/req/req_install.py
-@@ -38,6 +38,7 @@ from pip._internal.utils.misc import (
-     ask_path_exists,
-     backup_dir,
-     display_path,
-+    dist_in_install_path,
-     dist_in_site_packages,
-     dist_in_usersite,
-     get_installed_version,
-@@ -444,7 +445,7 @@ class InstallRequirement(object):
-                         "lack sys.path precedence to {} in {}".format(
-                             existing_dist.project_name, existing_dist.location)
-                     )
--            else:
-+            elif dist_in_install_path(existing_dist):
-                 self.should_reinstall = True
-         else:
-             if self.editable and self.satisfied_by:
-diff --git a/src/pip/_internal/resolution/legacy/resolver.py b/src/pip/_internal/resolution/legacy/resolver.py
-index cdb44d19..52e122c6 100644
---- a/src/pip/_internal/resolution/legacy/resolver.py
-+++ b/src/pip/_internal/resolution/legacy/resolver.py
-@@ -33,6 +33,7 @@ from pip._internal.resolution.base import BaseResolver
- from pip._internal.utils.compatibility_tags import get_supported
- from pip._internal.utils.logging import indent_log
- from pip._internal.utils.misc import dist_in_usersite, normalize_version_info
-+from pip._internal.utils.misc import dist_in_install_path
- from pip._internal.utils.packaging import (
-     check_requires_python,
-     get_requires_python,
-@@ -203,7 +204,9 @@ class Resolver(BaseResolver):
-         """
-         # Don't uninstall the conflict if doing a user install and the
-         # conflict is not a user install.
--        if not self.use_user_site or dist_in_usersite(req.satisfied_by):
-+        if ((not self.use_user_site
-+                or dist_in_usersite(req.satisfied_by))
-+                and dist_in_install_path(req.satisfied_by)):
-             req.should_reinstall = True
-         req.satisfied_by = None
- 
-diff --git a/src/pip/_internal/utils/misc.py b/src/pip/_internal/utils/misc.py
-index 09031825..3c064f8f 100644
---- a/src/pip/_internal/utils/misc.py
-+++ b/src/pip/_internal/utils/misc.py
-@@ -29,6 +29,7 @@ from pip._vendor.six.moves.urllib.parse import unquote as urllib_unquote
- from pip import __version__
- from pip._internal.exceptions import CommandError
- from pip._internal.locations import (
-+    distutils_scheme,
-     get_major_minor_version,
-     site_packages,
-     user_site,
-@@ -400,6 +401,16 @@ def dist_in_site_packages(dist):
-     return dist_location(dist).startswith(normalize_path(site_packages))
- 
- 
-+def dist_in_install_path(dist):
-+    """
-+    Return True if given Distribution is installed in
-+    path matching distutils_scheme layout.
-+    """
-+    norm_path = normalize_path(dist_location(dist))
-+    return norm_path.startswith(normalize_path(
-+        distutils_scheme("")['purelib'].split('python')[0]))
-+
-+
- def dist_is_editable(dist):
-     # type: (Distribution) -> bool
-     """
--- 
-2.23.0
-
-

sources

@@ -1,3 +1 @@
-SHA512 (pip-20.1.1.tar.gz) = ee7b0345c08fbe0215811d07b4c57c1ceece826871842f6d1c174d82e8eee0ad810aa5413d6763ecd5a513e151792a53c36623ab99d2049555ef2542d32d1658
-SHA512 (d2e63fbfc62af3b7050f619b2f5bb8658985b931.tar.gz) = fc7b11c5cbf6322469ce2eaca2a8d7eb60b17398d316f7465ab5d3d38dabd00ee22a3da7437a28f6312f0115f77f2df0d8bf0abc671e055eef06356c94283409
-SHA512 (2018.2.tar.gz) = 4c09c43a70ecb3ca3bc9445b01bf209eb382e41d9c969145696dea38551992ed88fd9b725a1264380f3dbdf8acdaf5ada3ef86b44255cdfbdbe4a01a1630912d
+d935ee9146074b1d3f26c5f0acfd120e  pip-7.1.0.tar.gz

tests/tests.yml

@@ -1,82 +0,0 @@
----
-- hosts: localhost
-  roles:
-  - role: standard-test-basic
-    tags:
-    - classic
-    repositories:
-    - repo: "https://src.fedoraproject.org/tests/python.git"
-      dest: "python"
-    - repo: "https://src.fedoraproject.org/rpms/pyproject-rpm-macros.git"
-      dest: "pyproject-rpm-macros"
-    tests:
-    - smoke34:
-        dir: python/smoke
-        run: VERSION=3.4 ./venv.sh
-    - smoke35:
-        dir: python/smoke
-        run: VERSION=3.5 ./venv.sh
-    - smoke36:
-        dir: python/smoke
-        run: VERSION=3.6 ./venv.sh
-    - smoke37:
-        dir: python/smoke
-        run: VERSION=3.7 ./venv.sh
-    - smoke38:
-        dir: python/smoke
-        run: VERSION=3.8 ./venv.sh
-    - smoke39:
-        dir: python/smoke
-        run: VERSION=3.9 ./venv.sh
-    - smoke27:
-        dir: python/smoke
-        run: VERSION=2.7 METHOD=virtualenv ./venv.sh
-    - smoke34_virtualenv:
-        dir: python/smoke
-        run: VERSION=3.4 METHOD=virtualenv ./venv.sh
-    - smoke35_virtualenv:
-        dir: python/smoke
-        run: VERSION=3.5 METHOD=virtualenv ./venv.sh
-    - smoke36_virtualenv:
-        dir: python/smoke
-        run: VERSION=3.6 METHOD=virtualenv ./venv.sh
-    - smoke37_virtualenv:
-        dir: python/smoke
-        run: VERSION=3.7 METHOD=virtualenv ./venv.sh
-    - smoke38_virtualenv:
-        dir: python/smoke
-        run: VERSION=3.8 METHOD=virtualenv ./venv.sh
-    - smoke39_virtualenv:
-        dir: python/smoke
-        run: VERSION=3.9 METHOD=virtualenv ./venv.sh
-    - pipenv:
-        run: pipenv --three && pipenv install six
-    - pyproject_pytest:
-        dir: pyproject-rpm-macros/tests
-        run: ./mocktest.sh python-pytest
-    - pyproject_entrypoints:
-        dir: pyproject-rpm-macros/tests
-        run: ./mocktest.sh python-entrypoints
-    - pyproject_pluggy:
-        dir: pyproject-rpm-macros/tests
-        run: ./mocktest.sh python-pluggy
-    - pyproject_clikit:
-        dir: pyproject-rpm-macros/tests
-        run: ./mocktest.sh python-clikit
-    required_packages:
-    - gcc
-    - virtualenv
-    - python27
-    - python34
-    - python35
-    - python36
-    - python37
-    - python38
-    - python39
-    - python2-devel
-    - python3-devel
-    - python3-tox
-    - pipenv
-    - mock
-    - rpmdevtools
-    - rpm-build

vendor_meta.sh

@@ -1,21 +0,0 @@
-#!/usr/bin/bash -eu
-
-if [ $# -ne 1 ]; then
-  echo "Usage: ./vendor_meta.sh pip-10.0.0/src/pip/_vendor/vendor.txt"
-  exit 1
-fi
-
-licenses=''
-
-while read req; do
-  req=$(echo $req | cut -f1 -d' ')
-  name=$(echo $req | cut -f1 -d'=')
-  version=$(echo $req | cut -f3 -d'=' | tr -d '\r')
-  echo "Provides: bundled(python%{1}dist($name)) = $version"
-  license="$(pyp2rpm -v ${version} --no-venv ${name} | grep '^License:' | sed -e 's/License:\s*//')"
-  licenses="$licenses\n$name: $license"
-done < $1
-
-echo
-echo
-echo -e "$licenses"