CI: Add Python 3.12

Make python-pip-wheel compatible with Python 3.12.0a2+
Avoid importing distutils globally, backported from pip 22.3.
2022-11-16 15:16:05 +01:00 · 2022-11-16 15:16:05 +01:00 · 2022-09-06 19:28:55 +02:00
20 changed files with 1261 additions and 1314 deletions
--- a/.fmf/version
+++ b/.fmf/version
@ -1 +0,0 @@
-1
--- a/.gitignore
+++ b/.gitignore
@ -4,4 +4,4 @@
 /pip/
 /results_python-pip/
 *.rpm
-*.whl
+
--- a/avoid-importing-distutils-globally.patch
+++ b/avoid-importing-distutils-globally.patch
@ -0,0 +1,260 @@
+From 572694adc951836c60a92fe38c8612ad06a09da3 Mon Sep 17 00:00:00 2001
+From: Tzu-ping Chung <uranusjr@gmail.com>
+Date: Mon, 18 Jul 2022 04:48:31 +0800
+Subject: [PATCH] Avoid importing distutils globally
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The distutils module is deprecated in 3.11 so we should avoid importing
+it unless absolutely necessary to avoid emitting superfulous warnings.
+
+Rebased from https://github.com/pypa/pip/commit/0e06452530
+
+Also includes: Import distutils only if needed, but sooner
+
+Rebased from: https://github.com/pypa/pip/commit/db47515958
+
+Co-Authored-By: Stéphane Bidoul <stephane.bidoul@gmail.com>
+---
+ src/pip/_internal/locations/__init__.py | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/pip/_internal/locations/__init__.py b/src/pip/_internal/locations/__init__.py
+index dba182d..4cb45dc 100644
+--- a/src/pip/_internal/locations/__init__.py
+++ b/src/pip/_internal/locations/__init__.py
+@@ -11,7 +11,7 @@ from pip._internal.utils.compat import WINDOWS
+ from pip._internal.utils.deprecation import deprecated
+ from pip._internal.utils.virtualenv import running_under_virtualenv
+ 
+-from . import _distutils, _sysconfig
+from . import _sysconfig
+ from .base import (
+     USER_CACHE_DIR,
+     get_major_minor_version,
+@@ -47,6 +47,12 @@ _PLATLIBDIR: str = getattr(sys, "platlibdir", "lib")
+ 
+ _USE_SYSCONFIG = sys.version_info >= (3, 10)
+ 
+if not _USE_SYSCONFIG:
+    # Import distutils lazily to avoid deprecation warnings,
+    # but import it soon enough that it is in memory and available during
+    # a pip reinstall.
+    from . import _distutils
+
+ 
+ def _looks_like_bpo_44860() -> bool:
+     """The resolution to bpo-44860 will change this incorrect platlib.
+-- 
+2.38.1
+
+From 942f43f0bab6f8245f2597a4fd376702bffb88e9 Mon Sep 17 00:00:00 2001
+From: Pradyun Gedam <pgedam@bloomberg.net>
+Date: Fri, 17 Jun 2022 13:50:25 +0100
+Subject: [PATCH] Replace usage of `distutils.utils.change_root` with
+ copied-over logic
+
+This eliminates an import from distutils, by pulling in the relevant code
+into pip itself.
+
+Rebased from https://github.com/pypa/pip/commit/c520ccf75d
+---
+ src/pip/_internal/locations/_sysconfig.py     |  5 ++--
+ src/pip/_internal/locations/base.py           | 28 +++++++++++++++++++
+ .../_internal/operations/install/legacy.py    |  2 +-
+ 3 files changed, 31 insertions(+), 4 deletions(-)
+
+diff --git a/src/pip/_internal/locations/_sysconfig.py b/src/pip/_internal/locations/_sysconfig.py
+index 5e141aa..0bbc928 100644
+--- a/src/pip/_internal/locations/_sysconfig.py
+++ b/src/pip/_internal/locations/_sysconfig.py
+@@ -1,4 +1,3 @@
+-import distutils.util  # FIXME: For change_root.
+ import logging
+ import os
+ import sys
+@@ -9,7 +8,7 @@ from pip._internal.exceptions import InvalidSchemeCombination, UserInstallationI
+ from pip._internal.models.scheme import SCHEME_KEYS, Scheme
+ from pip._internal.utils.virtualenv import running_under_virtualenv
+ 
+-from .base import get_major_minor_version, is_osx_framework
+from .base import change_root, get_major_minor_version, is_osx_framework
+ 
+ logger = logging.getLogger(__name__)
+ 
+@@ -194,7 +193,7 @@ def get_scheme(
+     )
+     if root is not None:
+         for key in SCHEME_KEYS:
+-            value = distutils.util.change_root(root, getattr(scheme, key))
+            value = change_root(root, getattr(scheme, key))
+             setattr(scheme, key, value)
+     return scheme
+ 
+diff --git a/src/pip/_internal/locations/base.py b/src/pip/_internal/locations/base.py
+index 86dad4a..d73676d 100644
+--- a/src/pip/_internal/locations/base.py
+++ b/src/pip/_internal/locations/base.py
+@@ -5,6 +5,7 @@ import sys
+ import sysconfig
+ import typing
+ 
+from pip._internal.exceptions import InstallationError
+ from pip._internal.utils import appdirs
+ from pip._internal.utils.virtualenv import running_under_virtualenv
+ 
+@@ -22,6 +23,33 @@ def get_major_minor_version() -> str:
+     """
+     return "{}.{}".format(*sys.version_info)
+ 
+def change_root(new_root: str, pathname: str) -> str:
+    """Return 'pathname' with 'new_root' prepended.
+
+    If 'pathname' is relative, this is equivalent to os.path.join(new_root, pathname).
+    Otherwise, it requires making 'pathname' relative and then joining the
+    two, which is tricky on DOS/Windows and Mac OS.
+
+    This is borrowed from Python's standard library's distutils module.
+    """
+    if os.name == "posix":
+        if not os.path.isabs(pathname):
+            return os.path.join(new_root, pathname)
+        else:
+            return os.path.join(new_root, pathname[1:])
+
+    elif os.name == "nt":
+        (drive, path) = os.path.splitdrive(pathname)
+        if path[0] == "\\":
+            path = path[1:]
+        return os.path.join(new_root, path)
+
+    else:
+        raise InstallationError(
+            f"Unknown platform: {os.name}\n"
+            "Can not change root path prefix on unknown platform."
+        )
+
+ 
+ def get_src_prefix() -> str:
+     if running_under_virtualenv():
+diff --git a/src/pip/_internal/operations/install/legacy.py b/src/pip/_internal/operations/install/legacy.py
+index 2206c93..4281cb0 100644
+--- a/src/pip/_internal/operations/install/legacy.py
+++ b/src/pip/_internal/operations/install/legacy.py
+@@ -3,11 +3,11 @@
+ 
+ import logging
+ import os
+-from distutils.util import change_root
+ from typing import List, Optional, Sequence
+ 
+ from pip._internal.build_env import BuildEnvironment
+ from pip._internal.exceptions import InstallationError
+from pip._internal.locations.base import change_root
+ from pip._internal.models.scheme import Scheme
+ from pip._internal.utils.logging import indent_log
+ from pip._internal.utils.misc import ensure_dir
+-- 
+2.38.1
+
+From 4ef5c7eac10bb1d88568af53373491fe6febfa63 Mon Sep 17 00:00:00 2001
+From: Pradyun Gedam <pgedam@bloomberg.net>
+Date: Fri, 17 Jun 2022 15:30:50 +0100
+Subject: [PATCH] Replace `distutils.fancy_getopt` with `getopt`
+
+This eliminates one location where distutils may be imported on
+Python 3.12+, by replacing the logic with mostly equivalent logic.
+
+Rebased from: https://github.com/pypa/pip/commit/8cbb89b6cc
+---
+ src/pip/_internal/utils/distutils_args.py | 51 ++++++++++++-----------
+ tests/unit/test_utils_distutils_args.py   |  2 +-
+ 2 files changed, 27 insertions(+), 26 deletions(-)
+
+diff --git a/src/pip/_internal/utils/distutils_args.py b/src/pip/_internal/utils/distutils_args.py
+index e4aa5b8..2fd1862 100644
+--- a/src/pip/_internal/utils/distutils_args.py
+++ b/src/pip/_internal/utils/distutils_args.py
+@@ -1,42 +1,43 @@
+-from distutils.errors import DistutilsArgError
+-from distutils.fancy_getopt import FancyGetopt
+from getopt import GetoptError, getopt
+ from typing import Dict, List
+ 
+ _options = [
+-    ("exec-prefix=", None, ""),
+-    ("home=", None, ""),
+-    ("install-base=", None, ""),
+-    ("install-data=", None, ""),
+-    ("install-headers=", None, ""),
+-    ("install-lib=", None, ""),
+-    ("install-platlib=", None, ""),
+-    ("install-purelib=", None, ""),
+-    ("install-scripts=", None, ""),
+-    ("prefix=", None, ""),
+-    ("root=", None, ""),
+-    ("user", None, ""),
+    "exec-prefix=",
+    "home=",
+    "install-base=",
+    "install-data=",
+    "install-headers=",
+    "install-lib=",
+    "install-platlib=",
+    "install-purelib=",
+    "install-scripts=",
+    "prefix=",
+    "root=",
+    "user",
+ ]
+ 
+ 
+-# typeshed doesn't permit Tuple[str, None, str], see python/typeshed#3469.
+-_distutils_getopt = FancyGetopt(_options)  # type: ignore
+-
+-
+ def parse_distutils_args(args: List[str]) -> Dict[str, str]:
+-    """Parse provided arguments, returning an object that has the
+-    matched arguments.
+    """Parse provided arguments, returning an object that has the matched arguments.
+ 
+     Any unknown arguments are ignored.
+     """
+     result = {}
+     for arg in args:
+         try:
+-            _, match = _distutils_getopt.getopt(args=[arg])
+-        except DistutilsArgError:
+            parsed_opt, _ = getopt(args=[arg], shortopts="", longopts=_options)
+        except GetoptError:
+             # We don't care about any other options, which here may be
+             # considered unrecognized since our option list is not
+             # exhaustive.
+-            pass
+-        else:
+-            result.update(match.__dict__)
+            continue
+
+        if not parsed_opt:
+            continue
+
+        option = parsed_opt[0]
+        name_from_parsed = option[0][2:].replace("-", "_")
+        value_from_parsed = option[1] or "true"
+        result[name_from_parsed] = value_from_parsed
+
+     return result
+diff --git a/tests/unit/test_utils_distutils_args.py b/tests/unit/test_utils_distutils_args.py
+index e63c565..21f31e9 100644
+--- a/tests/unit/test_utils_distutils_args.py
+++ b/tests/unit/test_utils_distutils_args.py
+@@ -60,4 +60,4 @@ def test_all_value_options_work(name: str, value: str) -> None:
+ 
+ def test_user_option_works() -> None:
+     result = parse_distutils_args(["--user"])
+-    assert result["user"] == 1
+    assert result["user"]
+-- 
+2.38.1
+
--- a/496
+++ b/496
@ -1,496 +0,0 @@
-* Mon Jan 22 2024 Miro Hrončok <mhroncok@redhat.com> - 23.3.1-5
- Switched to autogenerated BuildRequires for test dependencies,
-  which removed some that were no longer necessary
-
-* Mon Jan 22 2024 Fedora Release Engineering <releng@fedoraproject.org> - 23.3.1-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Fri Jan 12 2024 Maxwell G <maxwell@gtmx.me> - 23.3.1-3
- Remove unused python3-mock dependency
-
-* Wed Jan 03 2024 Maxwell G <maxwell@gtmx.me> - 23.3.1-2
- Remove weak dependency on python3-setuptools
-
-* Thu Nov 16 2023 Petr Viktorin <pviktori@redhat.com> - 23.3.1-1
- Update to 23.3.1
-Resolves: rhbz#2244306
-
-* Fri Aug 04 2023 Miro Hrončok <mhroncok@redhat.com> - 23.2.1-1
- Update to 23.2.1
-Resolves: rhbz#2223082
-
-* Fri Aug 04 2023 Miro Hrončok <mhroncok@redhat.com> - 23.1.2-7
- Actually run the tests and build the docs when building this package
-
-* Wed Jul 26 2023 Miro Hrončok <mhroncok@redhat.com> - 23.1.2-6
- Drop no-longer-needed custom changes to /usr/bin/pip*
- Stop Recommending libcrypt.so.1 on Python 3.12+
-Resolves: rhbz#2150373
-
-* Tue Jul 25 2023 Python Maint <python-maint@redhat.com> - 23.1.2-5
- Rebuilt for Python 3.12
-
-* Fri Jul 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 23.1.2-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Thu Jul 20 2023 Python Maint <python-maint@redhat.com> - 23.1.2-3
- Rebuilt for Python 3.12
-
-* Tue Jun 13 2023 Python Maint <python-maint@redhat.com> - 23.1.2-2
- Bootstrap for Python 3.12
-
-* Fri May 19 2023 Miro Hrončok <mhroncok@redhat.com> - 23.1.2-1
- Update to 23.1.2
-Resolves: rhbz#2186979
-
-* Mon Mar 27 2023 Karolina Surma <ksurma@redhat.com> - 23.0.1-2
- Fix compatibility with Sphinx 6+
-Resolves: rhbz#2180479
-
-* Mon Feb 20 2023 Tomáš Hrnčiar <thrnciar@redhat.com> - 23.0.1-1
- Update to 23.0.1
-Resolves: rhbz#2165760
-
-* Fri Jan 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 22.3.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
-
-* Mon Nov 14 2022 Karolina Surma <ksurma@redhat.com> - 22.3.1-1
- Update to 22.3.1
-Resolves: rhbz#2135044
-
-* Mon Sep 05 2022 Python Maint <python-maint@redhat.com> - 22.2.2-2
- Fix crash when an empty dist-info/egg-info is present
-Resolves: rhbz#2115001
- No longer use the rpm_install prefix to determine RPM-installed packages
-Related: rhbz#2026979
-
-* Wed Aug 03 2022 Charalampos Stratakis <cstratak@redhat.com> - 22.2.2-1
- Update to 22.2.2
-Resolves: rhbz#2109468
-
-* Fri Jul 22 2022 Charalampos Stratakis <cstratak@redhat.com> - 22.2-1
- Update to 22.2
-Resolves: rhbz#2109468
-
-* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 22.0.4-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Wed Jun 15 2022 Python Maint <python-maint@redhat.com> - 22.0.4-4
- Rebuilt for Python 3.11
-
-* Mon Jun 13 2022 Python Maint <python-maint@redhat.com> - 22.0.4-3
- Bootstrap for Python 3.11
-
-* Tue Apr 26 2022 Tomáš Hrnčiar <thrnciar@redhat.com> - 22.0.4-2
- Fallback to pep517 if setup.py is present and setuptools cannot be imported
- Fixes: rhbz#2020635
-
-* Mon Mar 21 2022 Karolina Surma <ksurma@redhat.com> - 22.0.4-1
- Update to 22.0.4
-Resolves: rhbz#2061262
-
-* Wed Feb 16 2022 Lumír Balhar <lbalhar@redhat.com> - 22.0.3-1
- Update to 22.0.3
-Resolves: rhbz#2048243
-
-* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 21.3.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
-
-* Mon Oct 25 2021 Miro Hrončok <mhroncok@redhat.com> - 21.3.1-1
- Update to 21.3.1
- Resolves: rhbz#2016682
-
-* Wed Oct 13 2021 Miro Hrončok <mhroncok@redhat.com> - 21.3-1
- Update to 21.3
- Resolves: rhbz#2013026
- Fix incomplete pip-updates in virtual environments
-
-* Wed Oct 06 2021 Charalampos Stratakis <cstratak@redhat.com> - 21.2.3-4
- Remove bundled windows executables
- Resolves: rhbz#2005453
-
-* Thu Sep 23 2021 Miro Hrončok <mhroncok@redhat.com> - 21.2.3-3
- Detect paths not to uninstall from via sysconfig's rpm_prefix install scheme
-
-* Mon Aug 16 2021 Miro Hrončok <mhroncok@redhat.com> - 21.2.3-2
- Fix broken uninstallation by a bogus downstream patch
-
-* Mon Aug 09 2021 Miro Hrončok <mhroncok@redhat.com> - 21.2.3-1
- Update to 21.2.3
- Resolves: rhbz#1985635
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 21.1.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Tue Jun 29 2021 Lumír Balhar <lbalhar@redhat.com> - 21.1.3-1
- Update to 21.1.3
-Resolves: rhbz#1976449
-
-* Mon Jun 07 2021 Karolina Surma <ksurma@redhat.com> - 21.1.2-1
- Update to 21.1.2
-Resolves: rhbz#1963433
-
-* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 21.1.1-3
- Rebuilt for Python 3.10
-
-* Tue Jun 01 2021 Python Maint <python-maint@redhat.com> - 21.1.1-2
- Bootstrap for Python 3.10
-
-* Mon May 10 2021 Karolina Surma <ksurma@redhat.com> - 21.1.1-1
- Update to 21.1.1
-
-* Sat Mar 13 2021 Miro Hrončok <mhroncok@redhat.com> - 21.0.1-2
- python-pip-wheel: Remove bundled provides and libcrypt recommends for Python 2
-  (The wheel is Python 3 only for a while)
-
-* Wed Feb 17 2021 Lumír Balhar <lbalhar@redhat.com> - 21.0.1-1
- Update to 21.0.1
-Resolves: rhbz#1922592
-
-* Tue Jan 26 2021 Lumír Balhar <lbalhar@redhat.com> - 21.0-1
- Update to 21.0 (#1919530)
-
-* Thu Dec 17 2020 Petr Viktorin <pviktori@redhat.com> - 20.3.3-1
- Update to 20.3.3
-
-* Mon Nov 30 2020 Miro Hrončok <mhroncok@redhat.com> - 20.3-1
- Update to 20.3
- Add support for PEP 600: Future manylinux Platform Tags
- New resolver
- Fixes: rhbz#1893470
-
-* Mon Oct 19 2020 Lumír Balhar <lbalhar@redhat.com> - 20.2.4-1
- Update to 20.2.4 (#1889112)
-
-* Wed Aug 05 2020 Tomas Orsava <torsava@redhat.com> - 20.2.2-1
- Update to 20.2.2 (#1838553)
-
-* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20.1.1-7
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
-
-* 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
-
-* Wed Jul 01 2015 Slavek Kabrda <bkabrda@redhat.com> - 7.1.0-1
- Update to 7.1.0
-
-* Tue Jun 30 2015 Ville Skyttä <ville.skytta@iki.fi> - 7.0.3-3
- Install bash completion
- Ship LICENSE.txt as %%license where available
-
-* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.0.3-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
-
-* Thu Jun 04 2015 Matej Stuchlik <mstuchli@redhat.com> - 7.0.3-1
- Update to 7.0.3
-
-* Fri Mar 06 2015 Matej Stuchlik <mstuchli@redhat.com> - 6.0.8-1
- Update to 6.0.8
-
-* Thu Dec 18 2014 Slavek Kabrda <bkabrda@redhat.com> - 1.5.6-5
- Only enable tests on Fedora.
-
-* Mon Dec 01 2014 Matej Stuchlik <mstuchli@redhat.com> - 1.5.6-4
- Add tests
- Add patch skipping tests requiring Internet access
-
-* Tue Nov 18 2014 Matej Stuchlik <mstuchli@redhat.com> - 1.5.6-3
- Added patch for local dos with predictable temp dictionary names
-  (http://seclists.org/oss-sec/2014/q4/655)
-
-* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.6-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
-
-* Sun May 25 2014 Matej Stuchlik <mstuchli@redhat.com> - 1.5.6-1
- Update to 1.5.6
-
-* Fri Apr 25 2014 Matej Stuchlik <mstuchli@redhat.com> - 1.5.4-4
- Rebuild as wheel for Python 3.4
-
-* Thu Apr 24 2014 Matej Stuchlik <mstuchli@redhat.com> - 1.5.4-3
- Disable build_wheel
-
-* Thu Apr 24 2014 Matej Stuchlik <mstuchli@redhat.com> - 1.5.4-2
- Rebuild as wheel for Python 3.4
-
-* Mon Apr 07 2014 Matej Stuchlik <mstuchli@redhat.com> - 1.5.4-1
- Updated to 1.5.4
-
-* Mon Oct 14 2013 Tim Flink <tflink@fedoraproject.org> - 1.4.1-1
- Removed patch for CVE 2013-2099 as it has been included in the upstream 1.4.1 release
- Updated version to 1.4.1
-
-* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.1-5
- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
-
-* Tue Jul 16 2013 Toshio Kuratomi <toshio@fedoraproject.org> - 1.3.1-4
- Fix for CVE 2013-2099
-
-* Thu May 23 2013 Tim Flink <tflink@fedoraproject.org> - 1.3.1-3
- undo python2 executable rename to python-pip. fixes #958377
- fix summary to match upstream
-
-* Mon May 06 2013 Kevin Kofler <Kevin@tigcc.ticalc.org> - 1.3.1-2
- Fix main package Summary, it's for Python 2, not 3 (#877401)
-
-* Fri Apr 26 2013 Jon Ciesla <limburgher@gmail.com> - 1.3.1-1
- Update to 1.3.1, fix for CVE-2013-1888.
-
-* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
-
-* Tue Oct 09 2012 Tim Flink <tflink@fedoraproject.org> - 1.2.1-2
- Fixing files for python3-pip
-
-* Thu Oct 04 2012 Tim Flink <tflink@fedoraproject.org> - 1.2.1-1
- Update to upstream 1.2.1
- Change binary from pip-python to python-pip (RHBZ#855495)
- Add alias from python-pip to pip-python, to be removed at a later date
-
-* Tue May 15 2012 Tim Flink <tflink@fedoraproject.org> - 1.1.0-1
- Update to upstream 1.1.0
-
-* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
-
-* Sat Oct 22 2011 Tim Flink <tflink@fedoraproject.org> - 1.0.2-1
- update to 1.0.2 and added python3 subpackage
-
-* Wed Jun 22 2011 Tim Flink <tflink@fedoraproject.org> - 0.8.3-1
- update to 0.8.3 and project home page
-
-* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.2-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
-
-* Mon Dec 20 2010 Luke Macken <lmacken@redhat.com> - 0.8.2-1
- update to 0.8.2 of pip
-* Mon Aug 30 2010 Peter Halliday <phalliday@excelsiorsystems.net> - 0.8-1
- update to 0.8 of pip
-* Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 0.7.2-5
- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
-
-* Wed Jul 7 2010 Peter Halliday <phalliday@excelsiorsystems.net> - 0.7.2-1
- update to 0.7.2 of pip
-* Sun May 23 2010 Peter Halliday <phalliday@excelsiorsystems.net> - 0.7.1-1
- update to 0.7.1 of pip
-* Fri Jan 1 2010 Peter Halliday <phalliday@excelsiorsystems.net> - 0.6.1.4
- fix dependency issue
-* Fri Dec 18 2009 Peter Halliday <phalliday@excelsiorsystems.net> - 0.6.1-2
- fix spec file
-* Thu Dec 17 2009 Peter Halliday <phalliday@excelsiorsystems.net> - 0.6.1-1
- upgrade to 0.6.1 of pip
-* Mon Aug 31 2009 Peter Halliday <phalliday@excelsiorsystems.net> - 0.4-1
- Initial package
--- a/downstream-remove-pytest-subket.patch
+++ b/downstream-remove-pytest-subket.patch
@ -1,54 +0,0 @@
-From 35378ae02912d704d466e4809070e17a8d13ad0a Mon Sep 17 00:00:00 2001
-From: Karolina Surma <ksurma@redhat.com>
-Date: Thu, 7 Aug 2025 15:05:34 +0200
-Subject: [PATCH] Downstream-Only: Remove pytest-subket from tests
-
---
- tests/conftest.py | 17 -----------------
- 1 file changed, 17 deletions(-)
-
-diff --git a/tests/conftest.py b/tests/conftest.py
-index c98b871..ada7a7e 100644
--- a/tests/conftest.py
-+++ b/tests/conftest.py
-@@ -451,18 +451,6 @@ def coverage_install(
-     return _common_wheel_editable_install(tmpdir_factory, common_wheels, "coverage")
- 
- 
-@pytest.fixture(scope="session")
-def socket_install(tmpdir_factory: pytest.TempPathFactory, common_wheels: Path) -> Path:
-    lib_dir = _common_wheel_editable_install(
-        tmpdir_factory, common_wheels, "pytest_subket"
-    )
-    # pytest-subket is only included so it can intercept and block unexpected
-    # network requests. It should NOT be visible to the pip under test.
-    dist_info = next(lib_dir.glob("*.dist-info"))
-    shutil.rmtree(dist_info)
-    return lib_dir
-
-
- def install_pth_link(
-     venv: VirtualEnvironment, project_name: str, lib_dir: Path
- ) -> None:
-@@ -480,7 +468,6 @@ def virtualenv_template(
-     setuptools_install: Path,
-     wheel_install: Path,
-     coverage_install: Path,
-    socket_install: Path,
- ) -> VirtualEnvironment:
-     venv_type: VirtualEnvironmentType
-     if request.config.getoption("--use-venv"):
-@@ -495,10 +482,6 @@ def virtualenv_template(
-     # Install setuptools, wheel, pytest-subket, and pip.
-     install_pth_link(venv, "setuptools", setuptools_install)
-     install_pth_link(venv, "wheel", wheel_install)
-    install_pth_link(venv, "pytest_subket", socket_install)
-    # Also copy pytest-subket's .pth file so it can intercept socket calls.
-    with open(venv.site / "pytest_socket.pth", "w") as f:
-        f.write(socket_install.joinpath("pytest_socket.pth").read_text())
- 
-     pth, dist_info = pip_editable_parts
- 
-- 
-2.50.1
-
--- a/dummy-certifi.patch
+++ b/dummy-certifi.patch
@ -1,103 +1,36 @@
-From 7b5fbac83944e3a0dd975ff17b69358791b68721 Mon Sep 17 00:00:00 2001
+From 2c58d7301dd5a47570f782fe2fce7fbb1918f60c Mon Sep 17 00:00:00 2001
 From: Karolina Surma <ksurma@redhat.com>
-Date: Thu, 27 Jun 2024 10:38:53 +0200
+Date: Mon, 10 May 2021 16:38:50 +0200
 Subject: [PATCH] Dummy certifi patch

+Co-Authored-By: Tomas Hrnciar <thrnciar@redhat.com>
 ---
- src/pip/_vendor/certifi/core.py | 80 +++------------------------------
- 1 file changed, 6 insertions(+), 74 deletions(-)
+ src/pip/_vendor/certifi/core.py | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)

 diff --git a/src/pip/_vendor/certifi/core.py b/src/pip/_vendor/certifi/core.py
-index 2f2f7e0..bec6595 100644
+index b8140cf..f1a0b01 100644
 --- a/src/pip/_vendor/certifi/core.py
 +++ b/src/pip/_vendor/certifi/core.py
-@@ -4,80 +4,12 @@ certifi.py
- 
- This module returns the installation location of cacert.pem or its contents.
- """
-import sys
-import atexit
- 
-def exit_cacert_ctx() -> None:
-    _CACERT_CTX.__exit__(None, None, None)  # type: ignore[union-attr]
-+# The RPM-packaged certifi always uses the system certificates
-+def where() -> str:
-+    return '/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem'
- 
- 
-if sys.version_info >= (3, 11):
-
-    from importlib.resources import as_file, files
-
-    _CACERT_CTX = None
-    _CACERT_PATH = None
-
-    def where() -> str:
-        # This is slightly terrible, but we want to delay extracting the file
-        # in cases where we're inside of a zipimport situation until someone
-        # actually calls where(), but we don't want to re-extract the file
-        # on every call of where(), so we'll do it once then store it in a
-        # global variable.
-        global _CACERT_CTX
-        global _CACERT_PATH
-        if _CACERT_PATH is None:
-            # This is slightly janky, the importlib.resources API wants you to
-            # manage the cleanup of this file, so it doesn't actually return a
-            # path, it returns a context manager that will give you the path
-            # when you enter it and will do any cleanup when you leave it. In
-            # the common case of not needing a temporary file, it will just
-            # return the file system location and the __exit__() is a no-op.
-            #
-            # We also have to hold onto the actual context manager, because
-            # it will do the cleanup whenever it gets garbage collected, so
-            # we will also store that at the global level as well.
-            _CACERT_CTX = as_file(files("pip._vendor.certifi").joinpath("cacert.pem"))
-            _CACERT_PATH = str(_CACERT_CTX.__enter__())
-            atexit.register(exit_cacert_ctx)
-
-        return _CACERT_PATH
-
-    def contents() -> str:
-        return files("pip._vendor.certifi").joinpath("cacert.pem").read_text(encoding="ascii")
-
-else:
-
-    from importlib.resources import path as get_path, read_text
-
-    _CACERT_CTX = None
-    _CACERT_PATH = None
-
-    def where() -> str:
-        # This is slightly terrible, but we want to delay extracting the
-        # file in cases where we're inside of a zipimport situation until
-        # someone actually calls where(), but we don't want to re-extract
-        # the file on every call of where(), so we'll do it once then store
-        # it in a global variable.
-        global _CACERT_CTX
-        global _CACERT_PATH
-        if _CACERT_PATH is None:
-            # This is slightly janky, the importlib.resources API wants you
-            # to manage the cleanup of this file, so it doesn't actually
-            # return a path, it returns a context manager that will give
-            # you the path when you enter it and will do any cleanup when
-            # you leave it. In the common case of not needing a temporary
-            # file, it will just return the file system location and the
-            # __exit__() is a no-op.
-            #
-            # We also have to hold onto the actual context manager, because
-            # it will do the cleanup whenever it gets garbage collected, so
-            # we will also store that at the global level as well.
-            _CACERT_CTX = get_path("pip._vendor.certifi", "cacert.pem")
-            _CACERT_PATH = str(_CACERT_CTX.__enter__())
-            atexit.register(exit_cacert_ctx)
-
-        return _CACERT_PATH
-
-    def contents() -> str:
-        return read_text("pip._vendor.certifi", "cacert.pem", encoding="ascii")
-+def contents() -> str:
-+    with open(where(), encoding='utf=8') as data:
-+        return data.read()
-- 
-2.50.1
+@@ -14,6 +14,7 @@ class _PipPatchedCertificate(Exception):
+
+
+ try:
+    raise ImportError  # force fallback
+     # Return a certificate file on disk for a standalone pip zipapp running in
+     # an isolated build environment to use. Passing --cert to the standalone
+     # pip does not work since requests calls where() unconditionally on import.
+@@ -67,9 +68,7 @@ except ImportError:
+     # If we don't have importlib.resources, then we will just do the old logic
+     # of assuming we're on the filesystem and munge the path directly.
+     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.30.2

--- a/no-version-warning.patch
+++ b/no-version-warning.patch
@ -0,0 +1,16 @@
+diff --git a/src/pip/_vendor/packaging/version.py b/src/pip/_vendor/packaging/version.py
+index de9a09a..154e94d 100644
+--- a/src/pip/_vendor/packaging/version.py
+++ b/src/pip/_vendor/packaging/version.py
+@@ -108,11 +108,6 @@ class LegacyVersion(_BaseVersion):
+         self._version = str(version)
+         self._key = _legacy_cmpkey(self._version)
+ 
+-        warnings.warn(
+-            "Creating a LegacyVersion has been deprecated and will be "
+-            "removed in the next major release",
+-            DeprecationWarning,
+-        )
+ 
+     def __str__(self) -> str:
+         return self._version
--- a/nowarn-pip._internal.main.patch
+++ b/nowarn-pip._internal.main.patch
@ -0,0 +1,74 @@
+From 619782ad2d181fe2933ddf4edc7127fdc13dd0df Mon Sep 17 00:00:00 2001
+From: Karolina Surma <ksurma@redhat.com>
+Date: Mon, 10 May 2021 16:48:49 +0200
+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.
+
+Co-Authored-By: =?UTF-8?q?Miro=20Hron=C4=8Dok?= <miro@hroncok.cz>
+---
+ 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 6afb5c6..faf25af 100755
+--- a/src/pip/_internal/__init__.py
+++ b/src/pip/_internal/__init__.py
+@@ -16,4 +16,4 @@ def main(args: (Optional[List[str]]) = None) -> int:
+     """
+     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 1504a12..07d941b 100644
+--- a/src/pip/_internal/utils/entrypoints.py
+++ b/src/pip/_internal/utils/entrypoints.py
+@@ -4,7 +4,7 @@ from typing import List, Optional
+ from pip._internal.cli.main import main
+ 
+ 
+-def _wrapper(args: Optional[List[str]] = None) -> int:
+def _wrapper(args: Optional[List[str]] = None, _nowarn: bool = False) -> int:
+     """Central wrapper for all old entrypoints.
+ 
+     Historically pip has had several entrypoints defined. Because of issues
+@@ -16,12 +16,13 @@ def _wrapper(args: Optional[List[str]] = None) -> int:
+     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.32.0
+
--- a/pip-allow-different-versions.patch
+++ b/pip-allow-different-versions.patch
@ -0,0 +1,27 @@
+--- /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())
--- a/plan.fmf
+++ b/plan.fmf
@ -1,111 +0,0 @@
-execute:
-  how: tmt
-
-discover:
-  - name: tests_python
-    how: shell
-    url: https://src.fedoraproject.org/tests/python.git
-    tests:
-    - name: smoke36
-      path: /smoke
-      test: VERSION=3.6 TOX=false ./venv.sh
-    - name: smoke39
-      path: /smoke
-      test: VERSION=3.9 ./venv.sh
-    - name: smoke310
-      path: /smoke
-      test: VERSION=3.10 ./venv.sh
-    - name: smoke311
-      path: /smoke
-      test: VERSION=3.11 ./venv.sh
-    - name: smoke312
-      path: /smoke
-      test: VERSION=3.12 ./venv.sh
-    - name: smoke313
-      path: /smoke
-      test: VERSION=3.13 ./venv.sh
-    - name: smoke314
-      path: /smoke
-      test: VERSION=3.14 ./venv.sh
-    - name: smoke315
-      path: /smoke
-      test: VERSION=3.15 ./venv.sh
-    - name: smoke39_virtualenv
-      path: /smoke
-      test: VERSION=3.9 METHOD=virtualenv ./venv.sh
-    - name: smoke310_virtualenv
-      path: /smoke
-      test: VERSION=3.10 METHOD=virtualenv ./venv.sh
-    - name: smoke311_virtualenv
-      path: /smoke
-      test: VERSION=3.11 METHOD=virtualenv ./venv.sh
-    - name: smoke312_virtualenv
-      path: /smoke
-      test: VERSION=3.12 METHOD=virtualenv ./venv.sh
-    - name: smoke313_virtualenv
-      path: /smoke
-      test: VERSION=3.13 METHOD=virtualenv ./venv.sh
-    - name: smoke314_virtualenv
-      path: /smoke
-      test: VERSION=3.14 METHOD=virtualenv ./venv.sh
-    - name: smoke315_virtualenv
-      path: /smoke
-      test: VERSION=3.15 METHOD=virtualenv ./venv.sh
-  - name: rpms_pyproject-rpm-macros
-    how: shell
-    url: https://src.fedoraproject.org/rpms/pyproject-rpm-macros.git
-    tests:
-    - name: pyproject_pytest
-      path: /tests
-      test: ./mocktest.sh python-pytest
-    - name: pyproject_entrypoints
-      path: /tests
-      test: ./mocktest.sh python-entrypoints
-    - name: pyproject_pluggy
-      path: /tests
-      test: ./mocktest.sh python-pluggy
-    - name: pyproject_clikit
-      path: /tests
-      test: ./mocktest.sh python-clikit
-  - name: same_repo
-    how: shell
-    dist-git-source: true
-    dist-git-download-only: true
-    tests:
-    - name: mock_bootstrap_build
-      test: |
-        cd $TMT_SOURCE_DIR &&
-        $TMT_TREE/../discover/rpms_pyproject-rpm-macros/tests/tests/mocktest.sh python-pip --without tests --without man
-    - name: pip_install_upgrade
-      path: /tests/pip_install_upgrade/
-      test: ./runtest.sh
-    - name: bash_completion
-      path: /tests/bash_completion
-      test: ./pip_completion_full_test.sh
-prepare:
-  - name: Install dependencies
-    how: install
-    package:
-    - gcc
-    - virtualenv
-    - python3.6-devel
-    - python3.9-devel
-    - python3.10-devel
-    - python3.11-devel
-    - python3.12-devel
-    - python3.13-devel
-    - python3.14-devel
-    - python3.15-devel
-    - python3-devel
-    - python3-tox
-    - mock
-    - rpmdevtools
-    - rpm-build
-    - grep
-    - util-linux
-    - shadow-utils
-    - expect
-    - dnf
-  - name: Update packages
-    how: shell
-    script: dnf upgrade -y
--- a/python-pip.rpmlintrc
+++ b/python-pip.rpmlintrc
@ -1,9 +1,15 @@
 # This is just temporary, when upstream merges PRs it can be removed
+# https://github.com/ActiveState/appdirs/pull/144
 # https://github.com/psf/requests/pull/5410
+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')

-# This file is actually a script but in the vendored context of pip, it is never executed
-addFilter(r'non-executable-script .+/pip/_vendor/distro/distro.py\b')
+# REQUESTED dist-info file is not meant to have any content
+# Discussion: https://src.fedoraproject.org/rpms/python-pip/pull-request/69#comment-52525
+addFilter(r'zero-length .+/site-packages/.+\.dist-info/REQUESTED\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')
--- a/python-pip.spec
+++ b/python-pip.spec
@ -1,73 +1,60 @@
-# The original RHEL N+1 content set is defined by (build)dependencies
-# of the packages in Fedora ELN. Hence we disable tests here
+# The original RHEL 9 content set is defined by (build)dependencies
+# of the packages in Fedora ELN. Hence we disable tests and documentation here
 # to prevent pulling many unwanted packages in.
-%bcond tests %{defined fedora}
-# Whether to build the manual pages (useful for bootstrapping Sphinx)
-%bcond man 1
+# Once the RHEL 9 content set is defined and/or RHEL 9 forks from ELN,
+# the conditional can be removed from the Fedora spec file.
+# We intentionally keep this enabled on EPEL.
+%if 0%{?rhel} >= 9 && !0%{?epel}
+%bcond_with tests
+%bcond_with doc
+%else
+%bcond_without tests
+%bcond_without doc
+%endif

 %global srcname pip
-%global base_version 25.3
+%global base_version 21.3.1
 %global upstream_version %{base_version}%{?prerel}
 %global python_wheel_name %{srcname}-%{upstream_version}-py3-none-any.whl

+%global bashcompdir %(pkg-config --variable=completionsdir bash-completion 2>/dev/null)
+
 Name:           python-%{srcname}
 Version:        %{base_version}%{?prerel:~%{prerel}}
-Release:        %autorelease
+Release:        4%{?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:

-# certifi: MPL-2.0
-# CacheControl: Apache-2.0
-# dependency-groups: MIT
-# distlib: Python-2.0.1
-# distro: Apache-2.0
-# idna: BSD-3-Clause
-# msgpack: Apache-2.0
-# packaging: Apache-2.0 OR BSD-2-Clause
-# platformdirs: MIT
-# pygments: BSD-2-Clause
-# pyproject-hooks: MIT
-# requests: Apache-2.0
+# appdirs: MIT
+# certifi: MPLv2.0
+# chardet: LGPLv2
+# colorama: BSD
+# CacheControl: ASL 2.0
+# 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
+# requests: ASL 2.0
 # resolvelib: ISC
-# rich: MIT
 # setuptools: MIT
-# truststore: MIT
+# six: MIT
+# tenacity: ASL 2.0
 # tomli: MIT
-# tomli-w: MIT
 # urllib3: MIT
+# webencodings: BSD

-License:        MIT AND Python-2.0.1 AND Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MPL-2.0 AND (Apache-2.0 OR BSD-2-Clause)
+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

-# The following sources are wheels used only for tests.
-# They are not bundled in the built package and do not contribute to the overall license.
-# They are pre-built but only contain text files, rebuilding them in %%build has very little benefit.
-
-# setuptools.whl
-# We cannot use RPM-packaged python-setuptools-wheel because upstream pins to <80.
-# See https://github.com/pypa/pip/pull/13357 for rationale.
-Source1:        https://files.pythonhosted.org/packages/0d/6d/b4752b044bf94cb802d88a888dc7d288baaf77d7910b7dedda74b5ceea0c/setuptools-79.0.1-py3-none-any.whl
-
-# wheel.whl
-# We cannot use RPM-packaged python-wheel-wheel because we intent to drop that package in wheel 0.46+.
-# That version of wheel has runtime dependencies and is generally useless as a standalone wheel.
-# See https://github.com/pypa/pip/pull/13382 as an attempt to drop the requirement from pip tests.
-Source2:        https://files.pythonhosted.org/packages/0b/2c/87f3254fd8ffd29e4c02732eee68a83a1d3c346ae39bc6822dcbcb697f2b/wheel-0.45.1-py3-none-any.whl
-
-# flit_core.whl
-# This is not built as RPM-packaged wheel in Fedora at all.
-Source3:        https://files.pythonhosted.org/packages/f2/65/b6ba90634c984a4fcc02c7e3afe523fef500c4980fec67cc27536ee50acf/flit_core-3.12.0-py3-none-any.whl
-
-# coverage.whl
-# There is no RPM-packaged python-coverage-wheel, the package is archful.
-# Upstream uses this to measure coverage, which we don't.
-# This is a dummy placeholder package that only contains empty coverage.process_startup().
-# That way, we don't need to patch the usage out of conftest.py.
-Source4:        coverage-0-py3-none-any.whl
-
 BuildArch:      noarch

 %if %{with tests}
@ -75,41 +62,61 @@ BuildRequires:  /usr/bin/git
 BuildRequires:  /usr/bin/hg
 BuildRequires:  /usr/bin/bzr
 BuildRequires:  /usr/bin/svn
-BuildRequires:  python%{python3_pkgversion}-pytest-xdist
-%endif
-
-%if %{with man}
-# docs/requirements.txt contains many sphinx extensions
-# however, we only build the manual pages thanks to
-# https://github.com/pypa/pip/pull/13168
-# We also always use the "main" Sphinx, not python%%{python3_pkgversion}-sphinx
-BuildRequires:  python3-sphinx
+BuildRequires:  python-setuptools-wheel
+BuildRequires:  python-wheel-wheel
 %endif

 # 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
 # Could be replaced with https://www.python.org/dev/peps/pep-0668/
-Patch:          remove-existing-dist-only-if-path-conflicts.patch
+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
-# The same patch is a part of the RPM-packaged python-certifi
-Patch:          dummy-certifi.patch
+Patch4:         dummy-certifi.patch

-# pytest-subket has been introduced to intercept network calls
-# https://github.com/pypa/pip/commit/a4b40f62332ccb3228b12cc5ae1493c75177247a
-# We don't need a layer to check that, as we're by default in an offline environment
-Patch:          downstream-remove-pytest-subket.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

-# Patch for the bundled urllib3 for CVE-2025-50181
-# Redirects are not disabled when retries are disabled on PoolManager instantiation
-# Upstream fix: https://github.com/urllib3/urllib3/commit/f05b1329126d5be6de501f9d1e3e36738bc08857
-Patch:          urllib3-CVE-2025-50181.patch
+# Don't warn the user about packaging's LegacyVersion being deprecated.
+# (This also breaks Python's test suite when warnings are treated as errors.)
+# Upstream issue: https://github.com/pypa/packaging/issues/368
+Patch6:         no-version-warning.patch

-# Remove -s from Python shebang - ensure that packages installed with pip
-# to user locations are seen by pip itself
-%undefine _py3_shebang_s
+# Avoid importing distutils globally
+# This is needed to make the pip wheel usable with Python 3.12+
+# Backported from pip 22.3
+# https://github.com/pypa/pip/commit/0e06452530
+# https://github.com/pypa/pip/commit/db47515958
+# https://github.com/pypa/pip/commit/c520ccf75d
+# https://github.com/pypa/pip/commit/8cbb89b6cc
+Patch7:         avoid-importing-distutils-globally.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

 %description
 pip is a package management system used to install and manage software packages
@ -123,25 +130,28 @@ Packages" or "Pip Installs Python".
 # 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(cachecontrol)) = 0.14.3
-Provides: bundled(python%{1}dist(certifi)) = 2025.10.5
-Provides: bundled(python%{1}dist(dependency-groups)) = 1.3.1
-Provides: bundled(python%{1}dist(distlib)) = 0.4
-Provides: bundled(python%{1}dist(distro)) = 1.9
-Provides: bundled(python%{1}dist(idna)) = 3.10
-Provides: bundled(python%{1}dist(msgpack)) = 1.1.2
-Provides: bundled(python%{1}dist(packaging)) = 25
-Provides: bundled(python%{1}dist(platformdirs)) = 4.5
-Provides: bundled(python%{1}dist(pygments)) = 2.19.2
-Provides: bundled(python%{1}dist(pyproject-hooks)) = 1.2
-Provides: bundled(python%{1}dist(requests)) = 2.32.5
-Provides: bundled(python%{1}dist(resolvelib)) = 1.2.1
-Provides: bundled(python%{1}dist(rich)) = 14.2
-Provides: bundled(python%{1}dist(setuptools)) = 70.3
-Provides: bundled(python%{1}dist(tomli)) = 2.3
-Provides: bundled(python%{1}dist(tomli-w)) = 1.2
-Provides: bundled(python%{1}dist(truststore)) = 0.10.4
-Provides: bundled(python%{1}dist(urllib3)) = 1.26.20
+Provides: bundled(python%{1}dist(cachecontrol)) = 0.12.6
+Provides: bundled(python%{1}dist(certifi)) = 2021.5.30
+Provides: bundled(python%{1}dist(chardet)) = 4
+Provides: bundled(python%{1}dist(colorama)) = 0.4.4
+Provides: bundled(python%{1}dist(distlib)) = 0.3.3
+Provides: bundled(python%{1}dist(distro)) = 1.6
+Provides: bundled(python%{1}dist(html5lib)) = 1.1
+Provides: bundled(python%{1}dist(idna)) = 3.2
+Provides: bundled(python%{1}dist(msgpack)) = 1.0.2
+Provides: bundled(python%{1}dist(packaging)) = 21
+Provides: bundled(python%{1}dist(pep517)) = 0.12
+Provides: bundled(python%{1}dist(platformdirs)) = 2.4
+Provides: bundled(python%{1}dist(progress)) = 1.6
+Provides: bundled(python%{1}dist(pyparsing)) = 2.4.7
+Provides: bundled(python%{1}dist(requests)) = 2.26
+Provides: bundled(python%{1}dist(resolvelib)) = 0.8
+Provides: bundled(python%{1}dist(setuptools)) = 44
+Provides: bundled(python%{1}dist(six)) = 1.16
+Provides: bundled(python%{1}dist(tenacity)) = 8.0.1
+Provides: bundled(python%{1}dist(tomli)) = 1.0.3
+Provides: bundled(python%{1}dist(urllib3)) = 1.26.7
+Provides: bundled(python%{1}dist(webencodings)) = 0.5.1
 }

 # Some manylinux1 wheels need libcrypt.so.1.
@ -155,9 +165,6 @@ Provides: bundled(python%{1}dist(urllib3)) = 1.26.20
 # 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)
-# As of Python 3.12, we no longer use this,
-# see https://discuss.python.org/t/29455/
-# However, we keep it around for previous Python versions that use the wheel package.
 %global crypt_compat_recommends() %{expand:
 Recommends: (libcrypt.so.1()(64bit) if python%{1}(x86-64))
 Recommends: (libcrypt.so.1 if python%{1}(x86-32))
@ -174,16 +181,42 @@ BuildRequires:  python%{python3_pkgversion}-devel
 # 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:  pyproject-rpm-macros
-BuildRequires:  python%{python3_pkgversion}-flit-core
+BuildRequires:  python%{python3_pkgversion}-setuptools
 BuildRequires:  bash-completion
+%if %{with tests}
+BuildRequires:  python%{python3_pkgversion}-cryptography
+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
+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 %{python3_pkgversion}}
+%{bundled 3}

 Provides:       pip = %{version}-%{release}
+Conflicts:      python-pip < %{version}-%{release}
+
+# The python3.10 version that stopped using the rpm_prefix scheme
+Requires:       python3-libs >= 3.10.6-2
+
+
+%{crypt_compat_recommends 3}

 %description -n python%{python3_pkgversion}-%{srcname}
 pip is a package management system used to install and manage software packages
@ -191,21 +224,28 @@ 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
+BuildRequires:  python%{python3_pkgversion}-sphinx-inline-tabs
+BuildRequires:  python%{python3_pkgversion}-sphinx-copybutton
+BuildRequires:  python%{python3_pkgversion}-myst-parser
+
+%description doc
+A documentation for a tool for installing and managing Python packages
+
+%endif

 %package -n     %{python_wheel_pkg_prefix}-%{srcname}-wheel
 Summary:        The pip wheel
 Requires:       ca-certificates

 # Virtual provides for the packages bundled by pip:
-%{bundled %{python3_pkgversion}}
+%{bundled 3}

-# This is only relevant for Pythons that are older than 3.12 and don't use their own bundled wheels
-# It is also only relevant when this wheel is shared across multiple Pythons
-%if "%{python_wheel_pkg_prefix}" == "python"
-%{crypt_compat_recommends 3.11}
-%{crypt_compat_recommends 3.10}
-%{crypt_compat_recommends 3.9}
-%endif
+%{crypt_compat_recommends 3}

 %description -n %{python_wheel_pkg_prefix}-%{srcname}-wheel
 A Python wheel of pip to use with venv.
@ -216,142 +256,151 @@ A Python wheel of pip to use with venv.
 # this goes together with patch4
 rm src/pip/_vendor/certifi/*.pem

+# Do not use furo as HTML theme in docs
+# furo is not available in Fedora
+sed -i '/html_theme = "furo"/d' docs/html/conf.py
+
+# towncrier extension for Sphinx is not yet available in Fedora
+sed -i '/"sphinxcontrib.towncrier",/d' docs/html/conf.py
+
+# tests expect wheels in here
+ln -s %{python_wheel_dir} tests/data/common_wheels
+
+# Remove shebang from files in bundled chardet
+grep -lr "^#\!/usr/bin/env python" src/pip/_vendor/chardet/ | xargs sed -i "1d"
+
 # Remove windows executable binaries
 rm -v src/pip/_vendor/distlib/*.exe
-sed -i '/\.exe/d' pyproject.toml
-
-# Remove unused test requirements
-sed -Ei '/(pytest-(cov|xdist|rerunfailures|subket)|proxy\.py)/d' pyproject.toml
-
-# Remove unused pytest-subket options
-sed -Ei '/(--disable-socket|--allow-unix-socket|--allow-hosts=localhost)/d' pyproject.toml
-
-%if %{with tests}
-# tests expect wheels in here
-mkdir tests/data/common_wheels
-cp -a %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} tests/data/common_wheels
-%endif
-
-
-%if %{with tests}
-%generate_buildrequires
-# we only use this to generate test requires
-# the "pyproject" part is explicitly disabled as it generates a requirement on pip
-%pyproject_buildrequires -N -g test
-%endif
-
+sed -i '/\.exe/d' setup.py

 %build
-export PYTHONPATH=./src/
-%pyproject_wheel
+%py3_build_wheel

-%if %{with man}
-sphinx-build -t man -b man -d docs/build/doctrees/man -c docs/html docs/man docs/build/man
+%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}
 %endif


 %install
-export PYTHONPATH=./src/
-%pyproject_install
-%pyproject_save_files -l pip
+# The following is similar to %%pyproject_install, 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_wheel_name}/pip install \
+    --root %{buildroot} \
+    --no-deps \
+    --disable-pip-version-check \
+    --progress-bar off \
+    --verbose \
+    --ignore-installed \
+    --no-warn-script-location \
+    --no-index \
+    --no-cache-dir \
+    --find-links dist \
+    'pip==%{upstream_version}'

-# We'll install pip as pip3.X
-# Later we'll provide symbolic links, manpage links and bashcompletion fixes for alternative names
-%if "%{python3_pkgversion}" == "3"
-%global alternate_names pip-%{python3_version} pip-3 pip3 pip
-%else
-%global alternate_names pip-%{python3_version}
-%endif
-
-# Provide symlinks to executables
-mv %{buildroot}%{_bindir}/pip %{buildroot}%{_bindir}/pip%{python3_version}
-rm %{buildroot}%{_bindir}/pip3
-for pip in %{alternate_names}; do
-ln -s ./pip%{python3_version} %{buildroot}%{_bindir}/$pip
-done
-
-%if %{with man}
+%if %{with doc}
 pushd docs/build/man
 install -d %{buildroot}%{_mandir}/man1
 for MAN in *1; do
-install -pm0644 $MAN %{buildroot}%{_mandir}/man1/${MAN/pip/pip%{python3_version}}
-for pip in %{alternate_names}; do
-echo ".so ${MAN/pip/pip%{python3_version}}" > %{buildroot}%{_mandir}/man1/${MAN/pip/$pip}
+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
 done
 popd
 %endif

-mkdir -p %{buildroot}%{bash_completions_dir}
+# 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%{python3_version} completion --bash \
-    > %{buildroot}%{bash_completions_dir}/pip%{python3_version}
+    %{buildroot}%{_bindir}/pip completion --bash \
+    > %{buildroot}%{bashcompdir}/pip3

-# Make bash completion apply to all alternate names symlinks we install
-sed -i -e "s/^\\(complete.*\\) pip%{python3_version}\$/\\1 pip%{python3_version} %{alternate_names}/" \
-    -e s/_pip_completion/_pip%{python3_version_nodots}_completion/ \
-    %{buildroot}%{bash_completions_dir}/pip%{python3_version}
+# 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
+
+
+# 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 and remove RECORD
+# %%pyproject macros do this for all packages
+echo rpm > %{buildroot}%{python3_sitelib}/pip-%{upstream_version}.dist-info/INSTALLER
+rm %{buildroot}%{python3_sitelib}/pip-%{upstream_version}.dist-info/RECORD

-# Install the built wheel and inject SBOM into it (if the macro is available)
 mkdir -p %{buildroot}%{python_wheel_dir}
-install -p %{_pyproject_wheeldir}/%{python_wheel_name} -t %{buildroot}%{python_wheel_dir}
-%{?python_wheel_inject_sbom:%python_wheel_inject_sbom %{buildroot}%{python_wheel_dir}/%{python_wheel_name}}
+install -p dist/%{python_wheel_name} -t %{buildroot}%{python_wheel_dir}


+%if %{with tests}
 %check
 # Verify bundled provides are up to date
 %{_rpmconfigdir}/pythonbundles.py src/pip/_vendor/vendor.txt --compare-with '%{bundled 3}'

-# Verify no unwanted files are present in the package
-grep "exe$" %{pyproject_files} && exit 1 || true
-grep "pem$" %{pyproject_files} && exit 1 || true
-
-# Verify we can at least run basic commands without crashing
-%{py3_test_envvars} %{buildroot}%{_bindir}/pip%{python3_version} --help
-%{py3_test_envvars} %{buildroot}%{_bindir}/pip%{python3_version} list
-%{py3_test_envvars} %{buildroot}%{_bindir}/pip%{python3_version} show pip
-
-%if %{with tests}
 # Upstream tests
 # bash completion tests only work from installed package
-pytest_k='not completion'
-# this clashes with our PYTHONPATH
-pytest_k="$pytest_k and not environments_with_no_pip"
-# this seems to require internet (despite no network marker)
-# added in https://github.com/pypa/pip/pull/13378 TODO drop this in the next release
-pytest_k="$pytest_k and not test_prompt_for_keyring_if_needed and not test_double_install_fail and not test_install_sdist_links and not test_lock_vcs and not test_lock_archive and not test_backend_sees_config_via_sdist"
-# this cannot import breezy, TODO investigate
-pytest_k="$pytest_k and not (functional and bazaar)"
-# failures to investigate
-pytest_k="$pytest_k and not test_all_fields and not test_report_mixed_not_found and not test_basic_show"  # "Editable project location" missing
-pytest_k="$pytest_k and not test_basic_install_from_wheel"
-pytest_k="$pytest_k and not test_check_unsupported"
+# needs unaltered sys.path and we cannot do that in %%check
+#     test_pep517_and_build_options
+#     test_config_file_venv_option
+# 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_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'

-%pytest -n auto -m 'not network' -k "$(echo $pytest_k)" \
-    --ignore tests/functional/test_proxy.py  # no proxy.py in Fedora
+# test_pep517 and test_pep660 are ignored entirely, as they import tomli_w and we don't have that packaged yet
+# --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)" \
+    --ignore tests/functional/test_pep660.py --ignore tests/functional/test_pep517.py \
+    --deselect tests/functional --deselect tests/lib/test_lib.py --deselect tests/unit/test_build_env.py
 %endif


-%files -n python%{python3_pkgversion}-%{srcname} -f %{pyproject_files}
+%files -n python%{python3_pkgversion}-%{srcname}
 %doc README.rst
-%if %{with man}
-%if "%{python3_pkgversion}" == "3"
-%{_mandir}/man1/pip{,3,-3}.1.*
-%{_mandir}/man1/pip{,3,-3}-[^3]*.1.*
+%license %{python3_sitelib}/pip-%{upstream_version}.dist-info/LICENSE.txt
+%if %{with doc}
+%{_mandir}/man1/pip.*
+%{_mandir}/man1/pip-*.*
+%{_mandir}/man1/pip3.*
+%{_mandir}/man1/pip3-*.*
 %endif
-%{_mandir}/man1/pip{,-}%{python3_version}.1.*
-%{_mandir}/man1/pip{,-}%{python3_version}-*.1.*
-%endif
-%if "%{python3_pkgversion}" == "3"
 %{_bindir}/pip
 %{_bindir}/pip3
 %{_bindir}/pip-3
-%endif
 %{_bindir}/pip%{python3_version}
 %{_bindir}/pip-%{python3_version}
-%dir %{bash_completions_dir}
-%{bash_completions_dir}/pip%{python3_version}
+%{python3_sitelib}/pip*
+%dir %{bashcompdir}
+%{bashcompdir}/pip3

+%if %{with doc}
+%files doc
+%license LICENSE.txt
+%doc README.rst
+%doc docs/build/html
+%endif

 %files -n %{python_wheel_pkg_prefix}-%{srcname}-wheel
 %license LICENSE.txt
@ -360,4 +409,412 @@ pytest_k="$pytest_k and not test_check_unsupported"
 %{python_wheel_dir}/%{python_wheel_name}

 %changelog
-%autochangelog
+* Wed Nov 16 2022 Miro Hrončok <mhroncok@redhat.com> - 21.3.1-4
+- Make python-pip-wheel compatible with Python 3.12.0a2+
+
+* Tue Sep 06 2022 Miro Hrončok <mhroncok@redhat.com> - 21.3.1-3
+- No longer use the rpm_install prefix to determine RPM-installed packages
+- Related: rhbz#2026979
+
+* Fri Jan 21 2022 Fedora Release Engineering <releng@fedoraproject.org> - 21.3.1-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
+
+* Mon Oct 25 2021 Miro Hrončok <mhroncok@redhat.com> - 21.3.1-1
+- Update to 21.3.1
+- Resolves: rhbz#2016682
+
+* Wed Oct 13 2021 Miro Hrončok <mhroncok@redhat.com> - 21.3-1
+- Update to 21.3
+- Resolves: rhbz#2013026
+- Fix incomplete pip-updates in virtual environments
+
+* Wed Oct 06 2021 Charalampos Stratakis <cstratak@redhat.com> - 21.2.3-4
+- Remove bundled windows executables
+- Resolves: rhbz#2005453
+
+* Thu Sep 23 2021 Miro Hrončok <mhroncok@redhat.com> - 21.2.3-3
+- Detect paths not to uninstall from via sysconfig's rpm_prefix install scheme
+
+* Mon Aug 16 2021 Miro Hrončok <mhroncok@redhat.com> - 21.2.3-2
+- Fix broken uninstallation by a bogus downstream patch
+
+* Mon Aug 09 2021 Miro Hrončok <mhroncok@redhat.com> - 21.2.3-1
+- Update to 21.2.3
+- Resolves: rhbz#1985635
+
+* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 21.1.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
+
+* Tue Jun 29 2021 Lumír Balhar <lbalhar@redhat.com> - 21.1.3-1
+- Update to 21.1.3
+Resolves: rhbz#1976449
+
+* Mon Jun 07 2021 Karolina Surma <ksurma@redhat.com> - 21.1.2-1
+- Update to 21.1.2
+Resolves: rhbz#1963433
+
+* Fri Jun 04 2021 Python Maint <python-maint@redhat.com> - 21.1.1-3
+- Rebuilt for Python 3.10
+
+* Tue Jun 01 2021 Python Maint <python-maint@redhat.com> - 21.1.1-2
+- Bootstrap for Python 3.10
+
+* Mon May 10 2021 Karolina Surma <ksurma@redhat.com> - 21.1.1-1
+- Update to 21.1.1
+
+* Sat Mar 13 2021 Miro Hrončok <mhroncok@redhat.com> - 21.0.1-2
+- python-pip-wheel: Remove bundled provides and libcrypt recommends for Python 2
+  (The wheel is Python 3 only for a while)
+
+* Wed Feb 17 2021 Lumír Balhar <lbalhar@redhat.com> - 21.0.1-1
+- Update to 21.0.1
+Resolves: rhbz#1922592
+
+* Tue Jan 26 2021 Lumír Balhar <lbalhar@redhat.com> - 21.0-1
+- Update to 21.0 (#1919530)
+
+* Thu Dec 17 2020 Petr Viktorin <pviktori@redhat.com> - 20.3.3-1
+- Update to 20.3.3
+
+* Mon Nov 30 2020 Miro Hrončok <mhroncok@redhat.com> - 20.3-1
+- Update to 20.3
+- Add support for PEP 600: Future manylinux Platform Tags
+- New resolver
+- Fixes: rhbz#1893470
+
+* Mon Oct 19 2020 Lumír Balhar <lbalhar@redhat.com> - 20.2.4-1
+- Update to 20.2.4 (#1889112)
+
+* Wed Aug 05 2020 Tomas Orsava <torsava@redhat.com> - 20.2.2-1
+- Update to 20.2.2 (#1838553)
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 20.1.1-7
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* 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
+
+* Wed Jul 01 2015 Slavek Kabrda <bkabrda@redhat.com> - 7.1.0-1
+- Update to 7.1.0
+
+* Tue Jun 30 2015 Ville Skyttä <ville.skytta@iki.fi> - 7.0.3-3
+- Install bash completion
+- Ship LICENSE.txt as %%license where available
+
+* Thu Jun 18 2015 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 7.0.3-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_23_Mass_Rebuild
+
+* Thu Jun 04 2015 Matej Stuchlik <mstuchli@redhat.com> - 7.0.3-1
+- Update to 7.0.3
+
+* Fri Mar 06 2015 Matej Stuchlik <mstuchli@redhat.com> - 6.0.8-1
+- Update to 6.0.8
+
+* Thu Dec 18 2014 Slavek Kabrda <bkabrda@redhat.com> - 1.5.6-5
+- Only enable tests on Fedora.
+
+* Mon Dec 01 2014 Matej Stuchlik <mstuchli@redhat.com> - 1.5.6-4
+- Add tests
+- Add patch skipping tests requiring Internet access
+
+* Tue Nov 18 2014 Matej Stuchlik <mstuchli@redhat.com> - 1.5.6-3
+- Added patch for local dos with predictable temp dictionary names
+  (http://seclists.org/oss-sec/2014/q4/655)
+
+* Sat Jun 07 2014 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.5.6-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_21_Mass_Rebuild
+
+* Sun May 25 2014 Matej Stuchlik <mstuchli@redhat.com> - 1.5.6-1
+- Update to 1.5.6
+
+* Fri Apr 25 2014 Matej Stuchlik <mstuchli@redhat.com> - 1.5.4-4
+- Rebuild as wheel for Python 3.4
+
+* Thu Apr 24 2014 Matej Stuchlik <mstuchli@redhat.com> - 1.5.4-3
+- Disable build_wheel
+
+* Thu Apr 24 2014 Matej Stuchlik <mstuchli@redhat.com> - 1.5.4-2
+- Rebuild as wheel for Python 3.4
+
+* Mon Apr 07 2014 Matej Stuchlik <mstuchli@redhat.com> - 1.5.4-1
+- Updated to 1.5.4
+
+* Mon Oct 14 2013 Tim Flink <tflink@fedoraproject.org> - 1.4.1-1
+- Removed patch for CVE 2013-2099 as it has been included in the upstream 1.4.1 release
+- Updated version to 1.4.1
+
+* Sun Aug 04 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.3.1-5
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_20_Mass_Rebuild
+
+* Tue Jul 16 2013 Toshio Kuratomi <toshio@fedoraproject.org> - 1.3.1-4
+- Fix for CVE 2013-2099
+
+* Thu May 23 2013 Tim Flink <tflink@fedoraproject.org> - 1.3.1-3
+- undo python2 executable rename to python-pip. fixes #958377
+- fix summary to match upstream
+
+* Mon May 06 2013 Kevin Kofler <Kevin@tigcc.ticalc.org> - 1.3.1-2
+- Fix main package Summary, it's for Python 2, not 3 (#877401)
+
+* Fri Apr 26 2013 Jon Ciesla <limburgher@gmail.com> - 1.3.1-1
+- Update to 1.3.1, fix for CVE-2013-1888.
+
+* Thu Feb 14 2013 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.2.1-3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_19_Mass_Rebuild
+
+* Tue Oct 09 2012 Tim Flink <tflink@fedoraproject.org> - 1.2.1-2
+- Fixing files for python3-pip
+
+* Thu Oct 04 2012 Tim Flink <tflink@fedoraproject.org> - 1.2.1-1
+- Update to upstream 1.2.1
+- Change binary from pip-python to python-pip (RHBZ#855495)
+- Add alias from python-pip to pip-python, to be removed at a later date
+
+* Tue May 15 2012 Tim Flink <tflink@fedoraproject.org> - 1.1.0-1
+- Update to upstream 1.1.0
+
+* Sat Jan 14 2012 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 1.0.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
+
+* Sat Oct 22 2011 Tim Flink <tflink@fedoraproject.org> - 1.0.2-1
+- update to 1.0.2 and added python3 subpackage
+
+* Wed Jun 22 2011 Tim Flink <tflink@fedoraproject.org> - 0.8.3-1
+- update to 0.8.3 and project home page
+
+* Tue Feb 08 2011 Fedora Release Engineering <rel-eng@lists.fedoraproject.org> - 0.8.2-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_15_Mass_Rebuild
+
+* Mon Dec 20 2010 Luke Macken <lmacken@redhat.com> - 0.8.2-1
+- update to 0.8.2 of pip
+* Mon Aug 30 2010 Peter Halliday <phalliday@excelsiorsystems.net> - 0.8-1
+- update to 0.8 of pip
+* Thu Jul 22 2010 David Malcolm <dmalcolm@redhat.com> - 0.7.2-5
+- Rebuilt for https://fedoraproject.org/wiki/Features/Python_2.7/MassRebuild
+
+* Wed Jul 7 2010 Peter Halliday <phalliday@excelsiorsystems.net> - 0.7.2-1
+- update to 0.7.2 of pip
+* Sun May 23 2010 Peter Halliday <phalliday@excelsiorsystems.net> - 0.7.1-1
+- update to 0.7.1 of pip
+* Fri Jan 1 2010 Peter Halliday <phalliday@excelsiorsystems.net> - 0.6.1.4
+- fix dependency issue
+* Fri Dec 18 2009 Peter Halliday <phalliday@excelsiorsystems.net> - 0.6.1-2
+- fix spec file
+* Thu Dec 17 2009 Peter Halliday <phalliday@excelsiorsystems.net> - 0.6.1-1
+- upgrade to 0.6.1 of pip
+* Mon Aug 31 2009 Peter Halliday <phalliday@excelsiorsystems.net> - 0.4-1
+- Initial package
+
--- a/remove-existing-dist-only-if-path-conflicts.patch
+++ b/remove-existing-dist-only-if-path-conflicts.patch
@ -1,12 +1,14 @@
-From d5cb806a14bb50a96484bca6536e81f2ac316b9d Mon Sep 17 00:00:00 2001
+From 517656ed4520b09ac6365467e459778f94ca2f0c Mon Sep 17 00:00:00 2001
 From: Karolina Surma <ksurma@redhat.com>
-Date: Wed, 16 Feb 2022 08:36:21 +0100
+Date: Mon, 10 May 2021 18:16:20 +0200
 Subject: [PATCH] Prevent removing of the system packages installed under
- /usr/lib when pip install --upgrade is executed.
+ /usr/lib
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit

+when pip install --upgrade is executed.
+
 Resolves: rhbz#1550368

 Co-Authored-By: Michal Cyprian <m.cyprian@gmail.com>
@ -14,95 +16,96 @@ Co-Authored-By: Victor Stinner <vstinner@redhat.com>
 Co-Authored-By: Petr Viktorin <pviktori@redhat.com>
 Co-Authored-By: Lumir Balhar <lbalhar@redhat.com>
 Co-Authored-By: Miro Hrončok <miro@hroncok.cz>
-Co-Authored-By: Karolina Surma <ksurma@redhat.com>
 ---
- src/pip/_internal/metadata/base.py                 | 12 +++++++++++-
- src/pip/_internal/req/req_install.py               |  2 +-
- src/pip/_internal/resolution/legacy/resolver.py    |  4 +++-
- src/pip/_internal/resolution/resolvelib/factory.py | 12 ++++++++++++
- 4 files changed, 27 insertions(+), 3 deletions(-)
+ src/pip/_internal/req/req_install.py               |  3 ++-
+ src/pip/_internal/resolution/legacy/resolver.py    |  5 ++++-
+ src/pip/_internal/resolution/resolvelib/factory.py | 13 +++++++++++++
+ src/pip/_internal/utils/misc.py                    | 11 +++++++++++
+ 4 files changed, 30 insertions(+), 2 deletions(-)

-diff --git a/src/pip/_internal/metadata/base.py b/src/pip/_internal/metadata/base.py
-index 230e114..8bd5d31 100644
--- a/src/pip/_internal/metadata/base.py
-+++ b/src/pip/_internal/metadata/base.py
-@@ -23,7 +23,7 @@ from pip._vendor.packaging.utils import NormalizedName, canonicalize_name
- from pip._vendor.packaging.version import Version
- 
- from pip._internal.exceptions import NoneMetadataError
-from pip._internal.locations import site_packages, user_site
-+from pip._internal.locations import get_scheme, site_packages, user_site
- from pip._internal.models.direct_url import (
-     DIRECT_URL_METADATA_NAME,
-     DirectUrl,
-@@ -575,6 +575,16 @@ class BaseDistribution(Protocol):
-             for extra in self._iter_egg_info_extras():
-                 metadata["Provides-Extra"] = extra
- 
-+    @property
-+    def in_install_path(self) -> bool:
-+        """
-+        Return True if given Distribution is installed in
-+        path matching distutils_scheme layout.
-+        """
-+        norm_path = normalize_path(self.installed_location)
-+        return norm_path.startswith(normalize_path(
-+            get_scheme("").purelib.split('python')[0]))
-+
- 
- class BaseEnvironment:
-     """An environment containing distributions to introspect."""
 diff --git a/src/pip/_internal/req/req_install.py b/src/pip/_internal/req/req_install.py
-index c9f6bff..c101826 100644
+index ff0dd2f..a72aec8 100644
 --- a/src/pip/_internal/req/req_install.py
 +++ b/src/pip/_internal/req/req_install.py
-@@ -453,7 +453,7 @@ class InstallRequirement:
-                         f"lack sys.path precedence to {existing_dist.raw_name} "
-                         f"in {existing_dist.location}"
+@@ -46,6 +46,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_distribution,
+@@ -433,7 +434,7 @@ class InstallRequirement:
+                             existing_dist.project_name, existing_dist.location
+                         )
                     )
 -            else:
-+            elif existing_dist.in_install_path:
+            elif dist_in_install_path(existing_dist):
                 self.should_reinstall = True
         else:
             if self.editable:
 diff --git a/src/pip/_internal/resolution/legacy/resolver.py b/src/pip/_internal/resolution/legacy/resolver.py
-index 33a4fdc..1fe886e 100644
+index 09caaa6..c1542ec 100644
 --- a/src/pip/_internal/resolution/legacy/resolver.py
 +++ b/src/pip/_internal/resolution/legacy/resolver.py
-@@ -322,7 +322,9 @@ class Resolver(BaseResolver):
+@@ -44,6 +44,7 @@ from pip._internal.resolution.base import BaseResolver, InstallRequirementProvid
+ 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
+ 
+ logger = logging.getLogger(__name__)
+@@ -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.
-         assert req.satisfied_by is not None
-        if not self.use_user_site or req.satisfied_by.in_usersite:
+-        if not self.use_user_site or dist_in_usersite(req.satisfied_by):
 +        if ((not self.use_user_site
-+                or req.satisfied_by.in_usersite)
-+                and req.satisfied_by.in_install_path):
+                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/resolution/resolvelib/factory.py b/src/pip/_internal/resolution/resolvelib/factory.py
-index f23e4cd..1bada79 100644
+index 766dc26..c8c1cd8 100644
 --- a/src/pip/_internal/resolution/resolvelib/factory.py
 +++ b/src/pip/_internal/resolution/resolvelib/factory.py
-@@ -3,6 +3,8 @@ from __future__ import annotations
+@@ -1,6 +1,8 @@
 import contextlib
 import functools
 import logging
 +import sys
 +import sysconfig
- from collections.abc import Iterable, Iterator, Mapping, Sequence
 from typing import (
     TYPE_CHECKING,
-@@ -615,6 +617,16 @@ class Factory:
+     Dict,
+@@ -33,6 +34,7 @@ from pip._internal.exceptions import (
+     UnsupportedWheel,
+ )
+ from pip._internal.index.package_finder import PackageFinder
+from pip._internal.locations import get_scheme
+ from pip._internal.metadata import BaseDistribution, get_default_environment
+ from pip._internal.models.link import Link
+ from pip._internal.models.wheel import Wheel
+@@ -45,6 +47,7 @@ from pip._internal.req.req_install import (
+ from pip._internal.resolution.base import InstallRequirementProvider
+ from pip._internal.utils.compatibility_tags import get_supported
+ from pip._internal.utils.hashes import Hashes
+from pip._internal.utils.misc import dist_location
+ from pip._internal.utils.packaging import get_requirement
+ from pip._internal.utils.virtualenv import running_under_virtualenv
+ 
+@@ -526,6 +529,16 @@ class Factory:
         if dist is None:  # Not installed, no uninstallation required.
             return None
 
 +        # Prevent uninstalling packages from /usr
 +        try:
-+            if dist.installed_location in (
+            if dist_location(dist._dist) in (
 +                    sysconfig.get_path('purelib', scheme='posix_prefix', vars={'base': sys.base_prefix}),
 +                    sysconfig.get_path('platlib', scheme='posix_prefix', vars={'platbase': sys.base_prefix}),
-+            ):
+                ):
 +                return None
 +        except KeyError:  # this Python doesn't have 'rpm_prefix' scheme yet
 +            pass
@ -110,6 +113,35 @@ index f23e4cd..1bada79 100644
         # We're installing into global site. The current installation must
         # be uninstalled, no matter it's in global or user site, because the
         # user site installation has precedence over global.
+diff --git a/src/pip/_internal/utils/misc.py b/src/pip/_internal/utils/misc.py
+index d3e9053..d25d1c3 100644
+--- a/src/pip/_internal/utils/misc.py
+++ b/src/pip/_internal/utils/misc.py
+@@ -38,6 +38,7 @@ from pip._vendor.tenacity import retry, stop_after_delay, wait_fixed
+ from pip import __version__
+ from pip._internal.exceptions import CommandError
+ from pip._internal.locations import get_major_minor_version, site_packages, user_site
+from pip._internal.locations import get_scheme
+ from pip._internal.utils.compat import WINDOWS
+ from pip._internal.utils.egg_link import egg_link_path_from_location
+ from pip._internal.utils.virtualenv import running_under_virtualenv
+@@ -354,6 +355,16 @@ def dist_in_site_packages(dist: Distribution) -> bool:
+     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(
+        get_scheme("").purelib.split('python')[0]))
+
+
+ def get_distribution(req_name: str) -> Optional[Distribution]:
+     """Given a requirement name, return the installed Distribution object.
+ 
 -- 
-2.50.1
+2.32.0

--- a/6
+++ b/6
@ -1,5 +1 @@
-SHA512 (pip-25.3.tar.gz) = f50db092213ec3bb819d3da5669f73d119b5ec7f7ac5e8a587a17c27eafa32bc17a057df09389c526a3769ef3577f5553187d54ceffa89aed63f4b4498ff044e
-SHA512 (setuptools-79.0.1-py3-none-any.whl) = fef6cfc6f95a5bb7320f1680e1c665cb8d9a4e4227cde4d8aab8a50bed4bcf04320085b9d7d5343359f887008db5c5a861e57f3d08b7b0b2311a28adaeee6b4a
-SHA512 (wheel-0.45.1-py3-none-any.whl) = 86c16248ec804ee0ac95d43b03d47351dceb534d0cdc4025ca1eb073e39e539de44c870b9261f0373144e1537f0e42675a759a318a8d5d346bbd9efcb704061d
-SHA512 (flit_core-3.12.0-py3-none-any.whl) = 790c12b1f43201e365fb3f8f2f0a54e1a578876799dfdf8bfeea679a25ea096bf62946d006618c1458ae6e37ce6d00998f37e9aba426d5ab80d32ef2d75da4e0
-SHA512 (coverage-0-py3-none-any.whl) = e734192565347010efe68f8ba600254259c9b647f3c553fd4e5d87b1d7f955cb15d6f7d807716f4a6415d239beed945fbec7210feaf502e9cc849c332845926e
+SHA512 (pip-21.3.1.tar.gz) = 2f50f95fe36cffc18821a70824f5b28d03598894f9ea5b02acc4921d16fc7739131814828a2159bcd577331cc780c7776a3669fa1ca2d4690c861add10a16f00
--- a/tests/bash_completion/main.fmf
+++ b/tests/bash_completion/main.fmf
@ -1,35 +0,0 @@
-summary: PIP bash completion functionality smoke test
-description: |
-    Comprehensive test for pip bash completion functionality on Fedora/RHEL systems.
-
-    The test performs the following steps:
-    1. Finds the bash completion script in the given (e.g. python3-pip) RPM package
-    2. Discovers all pip executables in the package (e.g. /usr/bin/pip and /usr/bin/pip3.14)
-    3. Sources the completion script and verifies completion for all executables is registered
-    4. Runs functional TAB completion tests using expect (for regular and POSIX mode of Bash)
-    5. Validates that completion works for basic pip commands
-
-    This is a smoke test to ensure pip bash completion is properly
-    installed and functional after package installation.
-
-component:
-    - python3-pip
-
-test: ./pip_completion_full_test.sh
-
-framework: shell
-
-duration: 5m
-tier: 1
-
-
-require:
-    - python3-pip
-    - bash-completion
-    - expect
-    - rpm
-    - bash
-
-
-environment:
-    PACKAGE: python3-pip
--- a/tests/bash_completion/pip_completion_full_test.sh
+++ b/tests/bash_completion/pip_completion_full_test.sh
@ -1,88 +0,0 @@
-#!/bin/bash
-
-# Comprehensive PIP bash completion test for RHEL
-# Finds completion scripts from RPM, tests all pip binaries, and runs functional tests
-
-PACKAGE="${PACKAGE:-python3-pip}"
-
-
-# Step 1: Find bash completion scripts in python3-pip RPM package
-echo "Step 1: Finding bash completion scripts in $PACKAGE RPM package..."
-
-COMPLETION_FILE=$(rpm -ql $PACKAGE 2>/dev/null | grep -E "/usr/share/bash-completion/completions/" || true)
-
-if [[ -z "$COMPLETION_FILE" ]]; then
-    echo "✗ No bash completion files found in $PACKAGE package"
-    exit 1
-fi
-
-# Check if there's exactly one completion file
-COMPLETION_FILE_COUNT=$(echo "$COMPLETION_FILE" | wc -l)
-
-if [[ $COMPLETION_FILE_COUNT -gt 1 ]]; then
-    echo "✗ Multiple bash completion files found in $PACKAGE package:"
-    echo "$COMPLETION_FILE" | sed 's/^/  - /'
-    echo "Expected exactly one completion file, found $COMPLETION_FILE_COUNT"
-    exit 1
-fi
-
-
-echo "✓ Found completion file from $PACKAGE package:"
-echo "$COMPLETION_FILE" | sed 's/^/  - /'
-
-# Step 2: Find all pip binaries
-echo
-echo "Step 2: Finding all pip binaries..."
-PIP_BINARIES=()
-PIP_FILES=$(rpm -ql $PACKAGE | grep /bin/p)
-for pip_file in $PIP_FILES; do
-    if [[ -x "$pip_file" ]]; then
-        pip_cmd=$(basename "$pip_file")
-        PIP_BINARIES+=("$pip_cmd")
-        echo "✓ Found: $pip_cmd -> $pip_file"
-    fi
-done
-
-if [[ ${#PIP_BINARIES[@]} -eq 0 ]]; then
-    echo "✗ No pip binaries found"
-    exit 1
-fi
-
-echo "Total pip binaries found: ${#PIP_BINARIES[@]}"
-
-# Step 3: Source completion scripts and test each binary
-echo
-echo "Step 3: Testing completion for each pip binary..."
-
-for AS_POSIX in 0 1; do
-    if [[ $AS_POSIX -eq 1 ]]; then
-        echo "Testing in POSIX mode"
-        POSIX="--posix"
-    else
-        echo "Testing in non-POSIX mode"
-        POSIX=""
-    fi
-
-    echo "Sourcing: $COMPLETION_FILE"
-    if bash --norc $POSIX -c "source $COMPLETION_FILE" ; then
-        echo "✓ Successfully sourced $COMPLETION_FILE"
-    else
-        echo "! Warning: Failed to source $COMPLETION_FILE"
-        exit 1
-    fi
-
-    export AS_POSIX
-    for pip_exec in "${PIP_BINARIES[@]}"; do
-        echo "Running expect test with $COMPLETION_FILE and $pip_exec..."
-        if ./test_pip_completion.exp "$COMPLETION_FILE" "$pip_exec"; then
-            echo "✓ Functional test passed"
-        else
-            echo "✗ Functional test failed"
-            exit 1
-        fi
-    done
-
-done
-
-
-echo "✓ All tests completed successfully!"
--- a/tests/bash_completion/test_pip_completion.exp
+++ b/tests/bash_completion/test_pip_completion.exp
@ -1,117 +0,0 @@
-#!/usr/bin/expect -f
-
-# PIP bash completion smoke test using expect
-# Tests actual TAB completion functionality
-# Usage: test_pip_completion.exp [completion_file] [pip_binary]
-
-set timeout 5
-
-
-set completion_file [lindex $argv 0]
-set pip_exec [lindex $argv 1]
-
-
-puts "=== PIP Bash Completion Test (using expect) ==="
-puts "Testing completion file: $completion_file"
-puts "Testing pip binary: $pip_exec"
-
-# Check if completion file exists first
-if {![file exists $completion_file]} {
-    puts "✗ Completion file not found: $completion_file"
-    exit 1
-}
-puts "✓ Completion file found: $completion_file"
-
-# Start bash shell
-if {[info exists env(AS_POSIX)] && $env(AS_POSIX) == "1"} {
-    spawn bash --norc --posix
-} else {
-    spawn bash --norc
-}
-expect "$ "
-
-# Source the completion file
-send "source $completion_file\r"
-expect "$ "
-puts "Attempted to source completion file"
-
-# Test 1: Basic pip command completion
-puts "\nTest 1: Testing '$pip_exec ' + TAB completion..."
-send "$pip_exec "
-sleep 0.1
-# Send TAB TAB using hex codes
-send "\x09\x09"
-expect {
-    -re "(install|uninstall|list|show)" {
-        puts "✓ Basic pip commands found in completion"
-        expect "$ "
-    }
-    -re "Display all" {
-        puts "✓ Completion showing options menu"
-        send "n\r"
-        expect "$ "
-    }
-    timeout {
-        puts "✗ Timeout waiting for completion - test failed"
-        exit 1
-    }
-}
-
-# Clear the line and ensure clean prompt
-send "\x03"
-expect "$ "
-send "\r"
-expect "$ "
-
-# Test 2: Test partial command completion (simpler test)
-puts "\nTest 2: Testing '$pip_exec insta' + TAB completion..."
-send "$pip_exec insta"
-sleep 0.1
-# Single TAB for completion
-send "\x09"
-expect {
-    -re "install" {
-        puts "✓ Partial command completion works (insta -> install)"
-        expect "$ "
-    }
-    timeout {
-        puts "✗ Timeout on partial completion test - test failed"
-        exit 1
-    }
-}
-
-# Clear the line and ensure clean prompt
-send "\x03"
-expect "$ "
-send "\r"
-expect "$ "
-
-# Test 3: Test help completion
-puts "\nTest 3: Testing '$pip_exec --' + TAB completion..."
-send "$pip_exec --"
-sleep 0.1
-send "\x09\x09"
-expect {
-    -re "(--help|--version)" {
-        puts "✓ Command options found in completion"
-        expect "$ "
-    }
-    timeout {
-        puts "✗ Timeout on options completion test - test failed"
-        exit 1
-    }
-}
-
-# Final cleanup - make sure we're at clean prompt
-send "\x03"
-expect "$ "
-send "\r"
-expect "$ "
-
-# Exit bash cleanly
-send "exit\r"
-expect eof
-
-puts "\n=== Completion Test Complete ==="
-puts "PIP bash completion functionality tested!"
-
--- a/tests/pip_install_upgrade/runtest.sh
+++ b/tests/pip_install_upgrade/runtest.sh
@ -18,14 +18,14 @@ RPM_BUILD_ROOT=/ /usr/bin/pip install 'Pello==1.0.1'
 /usr/bin/pip freeze | grep '^Pello==1\.0\.2$'

 # Both installations should still exist
-test -d "${RPM_SITELIB}/pello-1.0.1.dist-info"
+test -d "${RPM_SITELIB}/Pello-1.0.1-py${PYTHON_VERSION}.egg-info" || test -d "${RPM_SITELIB}/Pello-1.0.1.dist-info"
 test -d "${LOCAL_SITELIB}/Pello-1.0.2.dist-info"

 # Let's ditch the local one
 /usr/bin/pip uninstall --yes Pello

 # It should only remove one of them
-test -d "${RPM_SITELIB}/pello-1.0.1.dist-info"
+test -d "${RPM_SITELIB}/Pello-1.0.1-py${PYTHON_VERSION}.egg-info" || test -d "${RPM_SITELIB}/Pello-1.0.1.dist-info"
 ! test -d "${LOCAL_SITELIB}/Pello-1.0.2.dist-info"

 # And pip should still see the RPM-installed one
--- a/tests/tests.yml
+++ b/tests/tests.yml
@ -0,0 +1,99 @@
+---
+- 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:
+    - smoke35_optional:
+        dir: python/smoke
+        run: VERSION=3.5 INSTALL_OR_SKIP=true ./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
+    - smoke310:
+        dir: python/smoke
+        run: VERSION=3.10 ./venv.sh
+    - smoke311:
+        dir: python/smoke
+        run: VERSION=3.11 ./venv.sh
+    - smoke312:
+        dir: python/smoke
+        run: VERSION=3.12 ./venv.sh
+    - smoke27:
+        dir: python/smoke
+        run: VERSION=2.7 METHOD=virtualenv ./venv.sh
+    - smoke35_virtualenv_optional:
+        dir: python/smoke
+        run: VERSION=3.5 METHOD=virtualenv INSTALL_OR_SKIP=true ./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
+    - smoke310_virtualenv:
+        dir: python/smoke
+        run: VERSION=3.10 METHOD=virtualenv ./venv.sh
+    - smoke311_virtualenv:
+        dir: python/smoke
+        run: VERSION=3.11 METHOD=virtualenv ./venv.sh
+    - smoke312_virtualenv:
+        dir: python/smoke
+        run: VERSION=3.12 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
+    - pip_install_upgrade
+    required_packages:
+    - gcc
+    - virtualenv
+    - python2.7
+    - python3.6
+    - python3.7
+    - python3.8
+    - python3.9
+    - python3.10
+    - python3.11
+    - python3.12-devel
+    - python2-devel
+    - python3-devel
+    - python3-tox
+    - pipenv
+    - mock
+    - rpmdevtools
+    - rpm-build
+    - grep
+    - util-linux
+    - shadow-utils
--- a/urllib3-CVE-2025-50181.patch
+++ b/urllib3-CVE-2025-50181.patch
@ -1,51 +0,0 @@
-From b3d543d7e16af844394316360ef1bf0b9d10f1b1 Mon Sep 17 00:00:00 2001
-From: Illia Volochii <illia.volochii@gmail.com>
-Date: Wed, 18 Jun 2025 16:25:01 +0300
-Subject: [PATCH] Security fix for CVE-2025-50181
-
-Co-authored-by: Seth Michael Larson <sethmichaellarson@gmail.com>
-Co-authored-by: Quentin Pradet <quentin.pradet@gmail.com>
-Co-authored-by: Seth Michael Larson <sethmichaellarson@gmail.com>
---
- src/pip/_vendor/urllib3/poolmanager.py | 18 +++++++++++++++++-
- 1 file changed, 17 insertions(+), 1 deletion(-)
-
-diff --git a/src/pip/_vendor/urllib3/poolmanager.py b/src/pip/_vendor/urllib3/poolmanager.py
-index fb51bf7..a8de7c6 100644
--- a/src/pip/_vendor/urllib3/poolmanager.py
-+++ b/src/pip/_vendor/urllib3/poolmanager.py
-@@ -170,6 +170,22 @@ class PoolManager(RequestMethods):
- 
-     def __init__(self, num_pools=10, headers=None, **connection_pool_kw):
-         RequestMethods.__init__(self, headers)
-+        if "retries" in connection_pool_kw:
-+            retries = connection_pool_kw["retries"]
-+            if not isinstance(retries, Retry):
-+                # When Retry is initialized, raise_on_redirect is based
-+                # on a redirect boolean value.
-+                # But requests made via a pool manager always set
-+                # redirect to False, and raise_on_redirect always ends
-+                # up being False consequently.
-+                # Here we fix the issue by setting raise_on_redirect to
-+                # a value needed by the pool manager without considering
-+                # the redirect boolean.
-+                raise_on_redirect = retries is not False
-+                retries = Retry.from_int(retries, redirect=False)
-+                retries.raise_on_redirect = raise_on_redirect
-+                connection_pool_kw = connection_pool_kw.copy()
-+                connection_pool_kw["retries"] = retries
-         self.connection_pool_kw = connection_pool_kw
-         self.pools = RecentlyUsedContainer(num_pools)
- 
-@@ -389,7 +405,7 @@ class PoolManager(RequestMethods):
-             kw["body"] = None
-             kw["headers"] = HTTPHeaderDict(kw["headers"])._prepare_for_method_change()
- 
-        retries = kw.get("retries")
-+        retries = kw.get("retries", response.retries)
-         if not isinstance(retries, Retry):
-             retries = Retry.from_int(retries, redirect=redirect)
- 
-- 
-2.51.0
-
Author	SHA1	Message	Date
Miro Hrončok	53513f5d18	CI: Add Python 3.12	2022-11-16 15:16:05 +01:00
Miro Hrončok	7715939f2f	Make python-pip-wheel compatible with Python 3.12.0a2+ Avoid importing distutils globally, backported from pip 22.3.	2022-11-16 15:16:05 +01:00
Miro Hrončok	9c645a0ab6	No longer use the rpm_install prefix to determine RPM-installed packages In https://src.fedoraproject.org/rpms/python3.11/c/d75ca77a64 the rpm_prefix scheme stopped being interesting. Instead, we make sure to properly set both {base} and {platbase} variables which was subtly wrong before.	2022-09-06 19:28:55 +02:00