Update to 25.3

- Fixes: rhbz#2406299
CI: Ensure the devel subpackages for 3.6 and 3.9 are available
2025-11-30 10:15:42 +01:00 · 2025-11-30 10:14:27 +01:00 · 2025-10-24 12:43:53 +02:00 · 2025-09-19 13:59:29 +02:00 · 2025-09-10 19:43:27 +02:00 · 2025-08-27 16:52:27 +02:00
27 changed files with 1451 additions and 7474 deletions
--- a/.fmf/version
+++ b/.fmf/version
@ -0,0 +1 @@
 1
--- a/.gitignore
+++ b/.gitignore
@ -1,34 +1,7 @@
-pip-0.7.2.tar.gz
+/*.tar.gz
-/pip-0.8.tar.gz
+/*.zip
-/pip-0.8.2.tar.gz
+/pip-*/
-/pip-0.8.3.tar.gz
+/pip/
-/pip-1.0.2.tar.gz
+/results_python-pip/
-/pip-1.1.tar.gz
+*.rpm
-/pip-1.3.1.tar.gz
+*.whl
 /pip-1.4.1.tar.gz
 /pip-1.5.4.tar.gz
 /pip-1.5.6.tar.gz
 /pip-1.5.6-tests.tar.gz
 /pip-6.0.8.tar.gz
 /pip-7.0.3.tar.gz
 /pip-7.1.0.tar.gz
 /pip-7.1.0-tests.tar.gz
 /pip-8.0.2.tar.gz
 /pip-8.1.2.tar.gz
 /pip-8.1.2-tests.tar.gz
 /pip-9.0.1.tar.gz
 /pip-9.0.1-tests.tar.gz
 /pip-9.0.3.tar.gz
 /pip-9.0.3-tests.tar.gz
 /pip-10.0.1.tar.gz
 /pip-18.0.tar.gz
 /d2e63fbfc62af3b7050f619b2f5bb8658985b931.zip
 /2018.2.tar.gz
 /pip-18.0-tests.tar.gz
 /d2e63fbfc62af3b7050f619b2f5bb8658985b931.tar.gz
 /pip-18.1.tar.gz
 /pip-18.1-tests.tar.gz
 /pip-19.0.2.tar.gz
 /pip-19.0.2-tests.tar.gz
 /pip-19.0.3.tar.gz
 /pip-19.0.3-tests.tar.gz
--- a/7873.patch
+++ b/7873.patch
@ -1,167 +0,0 @@
 From e65d560c1c92278085510771a7f696d804081948 Mon Sep 17 00:00:00 2001
 From: Tomas Hrnciar <thrnciar@redhat.com>
 Date: Mon, 20 Apr 2020 14:14:05 +0200
 Subject: [PATCH 1/2] Backport of necessary changes from PR #6770, needed for
 backport of PR #7872
 https://github.com/pypa/pip/pull/6770
 ---
 src/pip/_internal/download.py | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)
 diff --git a/src/pip/_internal/download.py b/src/pip/_internal/download.py
 index 2bbe1762..b3bd2414 100644
 --- a/src/pip/_internal/download.py
 +++ b/src/pip/_internal/download.py
@@ -729,9 +729,20 @@ def unpack_file_url(
     # If it's a url to a local directory
     if is_dir_url(link):
 +
 +        def ignore(d, names):
 +            # Pulling in those directories can potentially be very slow,
 +            # exclude the following directories if they appear in the top
 +            # level dir (and only it).
 +            # See discussion at https://github.com/pypa/pip/pull/6770
 +            return ['.tox', '.nox'] if d == link_path else []
         if os.path.isdir(location):
             rmtree(location)
 -        shutil.copytree(link_path, location, symlinks=True)
 +        shutil.copytree(link_path,
 +                        location,
 +                        symlinks=True,
 +                        ignore=ignore)
 +
         if download_dir:
             logger.info('Link is a directory, ignoring download_dir')
         return
 -- 
 2.23.0
 From f4ee6c36a8b37b1a325d2e2d47d6b3684ca5566b Mon Sep 17 00:00:00 2001
 From: Tomas Hrnciar <thrnciar@redhat.com>
 Date: Mon, 20 Apr 2020 14:46:49 +0200
 Subject: [PATCH 2/2] Prevent infinite recursion with pip wheel with $TMPDIR in
 $PWD
 During a build of extension module within `pip wheel` the source directory is
 recursively copied in a temporary directory.
 See https://github.com/pypa/pip/issues/7555
 When the temporary directory is inside the source directory
 (for example by setting `TMPDIR=$PWD/tmp`) this caused an infinite recursion
 that ended in:
 [Errno 36] File name too long
 We prevent that buy never copying the target to the target in _copy_source_tree.
 Fixes https://github.com/pypa/pip/issues/7872
 Avoid a test dependency on a C compiler, skip the test on Windows
 ---
 news/7872.bugfix                     |  1 +
 src/pip/_internal/download.py        | 23 ++++++++++++++++++-----
 tests/data/src/extension/extension.c |  0
 tests/data/src/extension/setup.py    |  4 ++++
 tests/functional/test_wheel.py       | 17 +++++++++++++++++
 5 files changed, 40 insertions(+), 5 deletions(-)
 create mode 100644 news/7872.bugfix
 create mode 100644 tests/data/src/extension/extension.c
 create mode 100644 tests/data/src/extension/setup.py
 diff --git a/news/7872.bugfix b/news/7872.bugfix
 new file mode 100644
 index 00000000..3550d573
 --- /dev/null
 +++ b/news/7872.bugfix
@@ -0,0 +1 @@
 +Prevent an infinite recursion with ``pip wheel`` when ``$TMPDIR`` is within the source directory.
 diff --git a/src/pip/_internal/download.py b/src/pip/_internal/download.py
 index b3bd2414..80689012 100644
 --- a/src/pip/_internal/download.py
 +++ b/src/pip/_internal/download.py
@@ -729,13 +729,26 @@ def unpack_file_url(
     # If it's a url to a local directory
     if is_dir_url(link):
 +        target_abspath = os.path.abspath(location)
 +        target_basename = os.path.basename(target_abspath)
 +        target_dirname = os.path.dirname(target_abspath)
         def ignore(d, names):
 -            # Pulling in those directories can potentially be very slow,
 -            # exclude the following directories if they appear in the top
 -            # level dir (and only it).
 -            # See discussion at https://github.com/pypa/pip/pull/6770
 -            return ['.tox', '.nox'] if d == link_path else []
 +            # type: (str, List[str]) -> List[str]
 +            skipped = []  # type: List[str]
 +            if d == link_path:
 +                # Pulling in those directories can potentially be very slow,
 +                # exclude the following directories if they appear in the top
 +                # level dir (and only it).
 +                # See discussion at https://github.com/pypa/pip/pull/6770
 +                skipped += ['.tox', '.nox']
 +            if os.path.abspath(d) == target_dirname:
 +                # Prevent an infinite recursion if the target is in source.
 +                # This can happen when TMPDIR is set to ${PWD}/...
 +                # and we copy PWD to TMPDIR.
 +                skipped += [target_basename]
 +            return skipped
 +
         if os.path.isdir(location):
             rmtree(location)
         shutil.copytree(link_path,
 diff --git a/tests/data/src/extension/extension.c b/tests/data/src/extension/extension.c
 new file mode 100644
 index 00000000..e69de29b
 diff --git a/tests/data/src/extension/setup.py b/tests/data/src/extension/setup.py
 new file mode 100644
 index 00000000..b26302b0
 --- /dev/null
 +++ b/tests/data/src/extension/setup.py
@@ -0,0 +1,4 @@
 +from setuptools import Extension, setup
 +
 +module = Extension('extension', sources=['extension.c'])
 +setup(name='extension', version='0.0.1', ext_modules = [module])
 diff --git a/tests/functional/test_wheel.py b/tests/functional/test_wheel.py
 index 7ab76c13..2a418bf4 100644
 --- a/tests/functional/test_wheel.py
 +++ b/tests/functional/test_wheel.py
@@ -1,5 +1,6 @@
 """'pip wheel' tests"""
 import os
 +import sys
 from os.path import exists
 import pytest
@@ -218,6 +219,22 @@ def test_pip_wheel_with_user_set_in_config(script, data, common_wheels):
     )
     assert "Successfully built withpyproject" in result.stdout, result.stdout
 +@pytest.mark.skipif(sys.platform.startswith('win'),
 +                    reason='The empty extension module does not work on Win')
 +def test_pip_wheel_ext_module_with_tmpdir_inside(script, data, common_wheels):
 +    tmpdir = data.src / 'extension/tmp'
 +    tmpdir.mkdir()
 +    script.environ['TMPDIR'] = str(tmpdir)
 +
 +    # To avoid a test dependency on a C compiler, we set the env vars to "noop"
 +    # The .c source is empty anyway
 +    script.environ['CC'] = script.environ['LDSHARED'] = str('true')
 +
 +    result = script.pip(
 +        'wheel', data.src / 'extension',
 +        '--no-index', '-f', common_wheels
 +    )
 +    assert "Successfully built extension" in result.stdout, result.stdout
 def test_pep517_wheels_are_not_confused_with_other_files(script, tmpdir, data):
     """Check correct wheels are copied. (#6196)
 -- 
 2.23.0
--- a/allow-stripping-given-prefix-from-wheel-RECORD-files.patch
+++ b/allow-stripping-given-prefix-from-wheel-RECORD-files.patch
@ -1,110 +0,0 @@
 diff --git a/src/pip/_internal/commands/install.py b/src/pip/_internal/commands/install.py
 index 1c244d23..4b07ec0f 100644
 --- a/src/pip/_internal/commands/install.py
 +++ b/src/pip/_internal/commands/install.py
@@ -109,6 +109,14 @@ class InstallCommand(RequirementCommand):
             default=None,
             help="Installation prefix where lib, bin and other top-level "
                  "folders are placed")
 +        cmd_opts.add_option(
 +            '--strip-file-prefix',
 +            dest='strip_file_prefix',
 +            metavar='prefix',
 +            default=None,
 +            help="Strip given prefix from script paths in wheel RECORD."
 +        )
 +
         cmd_opts.add_option(cmdoptions.build_dir())
@@ -391,6 +399,7 @@ class InstallCommand(RequirementCommand):
                         pycompile=options.compile,
                         warn_script_location=warn_script_location,
                         use_user_site=options.use_user_site,
 +                        strip_file_prefix=options.strip_file_prefix,
                     )
                     lib_locations = get_lib_location_guesses(
 diff --git a/src/pip/_internal/req/req_install.py b/src/pip/_internal/req/req_install.py
 index a4834b00..d21530ac 100644
 --- a/src/pip/_internal/req/req_install.py
 +++ b/src/pip/_internal/req/req_install.py
@@ -431,7 +431,8 @@ class InstallRequirement(object):
         prefix=None,  # type: Optional[str]
         warn_script_location=True,  # type: bool
         use_user_site=False,  # type: bool
 -        pycompile=True  # type: bool
 +        pycompile=True,  # type: bool
 +        strip_file_prefix=None  # type: Optional[str]
     ):
         # type: (...) -> None
         move_wheel_files(
@@ -443,6 +444,7 @@ class InstallRequirement(object):
             pycompile=pycompile,
             isolated=self.isolated,
             warn_script_location=warn_script_location,
 +            strip_file_prefix=strip_file_prefix,
         )
     # Things valid for sdists
@@ -894,7 +896,8 @@ class InstallRequirement(object):
         prefix=None,  # type: Optional[str]
         warn_script_location=True,  # type: bool
         use_user_site=False,  # type: bool
 -        pycompile=True  # type: bool
 +        pycompile=True,  # type: bool
 +        strip_file_prefix=None  # type: Optional[str]
     ):
         # type: (...) -> None
         global_options = global_options if global_options is not None else []
@@ -911,6 +914,7 @@ class InstallRequirement(object):
                 self.source_dir, root=root, prefix=prefix, home=home,
                 warn_script_location=warn_script_location,
                 use_user_site=use_user_site, pycompile=pycompile,
 +                strip_file_prefix=strip_file_prefix,
             )
             self.install_succeeded = True
             return
 diff --git a/src/pip/_internal/wheel.py b/src/pip/_internal/wheel.py
 index 67bcc7f7..6470576b 100644
 --- a/src/pip/_internal/wheel.py
 +++ b/src/pip/_internal/wheel.py
@@ -265,6 +265,7 @@ def get_csv_rows_for_installed(
     changed,  # type: set
     generated,  # type: List[str]
     lib_dir,  # type: str
 +    strip_file_prefix=None,  # type: Optional[str]
 ):
     # type: (...) -> List[InstalledCSVRow]
     """
@@ -289,7 +290,11 @@ def get_csv_rows_for_installed(
         installed_rows.append(tuple(row))
     for f in generated:
         digest, length = rehash(f)
 -        installed_rows.append((normpath(f, lib_dir), digest, str(length)))
 +        final_path = normpath(f, lib_dir)
 +        if strip_file_prefix and final_path.startswith(strip_file_prefix):
 +            final_path = os.path.join(os.sep,
 +                    os.path.relpath(final_path, strip_file_prefix))
 +        installed_rows.append((final_path, digest, str(length)))
     for f in installed:
         installed_rows.append((installed[f], '', ''))
     return installed_rows
@@ -306,7 +311,8 @@ def move_wheel_files(
     scheme=None,  # type: Optional[Mapping[str, str]]
     isolated=False,  # type: bool
     prefix=None,  # type: Optional[str]
 -    warn_script_location=True  # type: bool
 +    warn_script_location=True,  # type: bool
 +    strip_file_prefix=None  # type: Optional[str]
 ):
     # type: (...) -> None
     """Install a wheel"""
@@ -605,6 +611,7 @@ if __name__ == '__main__':
             outrows = get_csv_rows_for_installed(
                 reader, installed=installed, changed=changed,
                 generated=generated, lib_dir=lib_dir,
 +                strip_file_prefix=strip_file_prefix
             )
             writer = csv.writer(record_out)
             # Sort to simplify testing.
--- a/496
+++ b/496
@ -0,0 +1,496 @@
 * 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
@ -0,0 +1,54 @@
 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,15 +1,103 @@
 From 7b5fbac83944e3a0dd975ff17b69358791b68721 Mon Sep 17 00:00:00 2001
 From: Karolina Surma <ksurma@redhat.com>
 Date: Thu, 27 Jun 2024 10:38:53 +0200
 Subject: [PATCH] Dummy certifi patch
 ---
 src/pip/_vendor/certifi/core.py | 80 +++------------------------------
 1 file changed, 6 insertions(+), 74 deletions(-)
 diff --git a/src/pip/_vendor/certifi/core.py b/src/pip/_vendor/certifi/core.py
-index 2d02ea4..b1e4975 100644
+index 2f2f7e0..bec6595 100644
 --- a/src/pip/_vendor/certifi/core.py
 +++ b/src/pip/_vendor/certifi/core.py
-@@ -11,9 +11,7 @@ import os
+@@ -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'
- def where():
+-if sys.version_info >= (3, 11):
 -    f = os.path.dirname(__file__)
 -
-    return os.path.join(f, 'cacert.pem')
+-    from importlib.resources import as_file, files
-+    return '/etc/pki/tls/certs/ca-bundle.crt'
+-
- 
+-    _CACERT_CTX = None
- 
+-    _CACERT_PATH = None
- if __name__ == '__main__':
+-
 -    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
--- a/emit-a-warning-when-running-with-root-privileges.patch
+++ b/emit-a-warning-when-running-with-root-privileges.patch
@ -1,37 +0,0 @@
 diff --git a/src/pip/_internal/commands/install.py b/src/pip/_internal/commands/install.py
 index 1279d4a..aeb9d26 100644
 --- a/src/pip/_internal/commands/install.py
 +++ b/src/pip/_internal/commands/install.py
@@ -5,6 +5,8 @@ import logging
 import operator
 import os
 import shutil
 +import sys
 +from os import path
 from optparse import SUPPRESS_HELP
 from pip._vendor import pkg_resources
@@ -217,6 +219,23 @@ class InstallCommand(RequirementCommand):
     def run(self, options, args):
         cmdoptions.check_install_build_global(options)
 +
 +        def is_venv():
 +            return (hasattr(sys, 'real_prefix') or
 +                    (hasattr(sys, 'base_prefix') and
 +                     sys.base_prefix != sys.prefix))
 +
 +        # Check whether we have root privileges and aren't in venv/virtualenv
 +        if os.getuid() == 0 and not is_venv():
 +            command = path.basename(sys.argv[0])
 +            if command == "__main__.py":
 +                command = path.basename(sys.executable) + " -m pip"
 +            logger.warning(
 +                "WARNING: Running pip install with root privileges is "
 +                "generally not a good idea. Try `%s install --user` instead."
 +                % command
 +            )
 +
         upgrade_strategy = "to-satisfy-only"
         if options.upgrade:
             upgrade_strategy = options.upgrade_strategy
--- a/html_theme_path.patch
+++ b/html_theme_path.patch
@ -1,11 +0,0 @@
 diff -ru pip-10.0.1/docs/conf.py pip-10.0.1_patched/docs/conf.py
 --- pip-10.0.1/docs/html/conf.py	2018-04-14 13:17:31.000000000 +0200
 +++ pip-10.0.1_patched/docs/html/conf.py	2018-07-23 15:23:31.053267611 +0200
@@ -134,6 +134,7 @@
 # The theme to use for HTML and HTML Help pages.  Major themes that come with
 # Sphinx are currently 'default' and 'sphinxdoc'.
 html_theme = "pypa_theme"
 +html_theme_path = ["pypa", "python-docs-theme"]
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
--- a/local-dos.patch
+++ b/local-dos.patch
@ -1,395 +0,0 @@
 diff --git a/pip/cmdoptions.py b/pip/cmdoptions.py
 index 8ed3d91..01b2104 100644
 --- a/pip/cmdoptions.py
 +++ b/pip/cmdoptions.py
@@ -9,7 +9,7 @@ To be consistent, all options will follow this design.
 """
 import copy
 from optparse import OptionGroup, SUPPRESS_HELP, Option
 -from pip.locations import build_prefix, default_log_file
 +from pip.locations import default_log_file
 def make_option_group(group, parser):
@@ -297,10 +297,8 @@ build_dir = OptionMaker(
     '-b', '--build', '--build-dir', '--build-directory',
     dest='build_dir',
     metavar='dir',
 -    default=build_prefix,
 -    help='Directory to unpack packages into and build in. '
 -    'The default in a virtualenv is "<venv path>/build". '
 -    'The default for global installs is "<OS temp dir>/pip_build_<username>".')
 +    help='Directory to unpack packages into and build in.',
 +)
 install_options = OptionMaker(
     '--install-option',
 diff --git a/pip/commands/install.py b/pip/commands/install.py
 index cbf22a0..cb7d0db 100644
 --- a/pip/commands/install.py
 +++ b/pip/commands/install.py
@@ -10,6 +10,7 @@ from pip.basecommand import Command
 from pip.index import PackageFinder
 from pip.exceptions import InstallationError, CommandError, PreviousBuildDirError
 from pip import cmdoptions
 +from pip.util import BuildDirectory
 class InstallCommand(Command):
@@ -188,7 +189,7 @@ class InstallCommand(Command):
         if (
             options.no_install or
             options.no_download or
 -            (options.build_dir != build_prefix) or
 +            options.build_dir or
             options.no_clean
         ):
             logger.deprecated('1.7', 'DEPRECATION: --no-install, --no-download, --build, '
@@ -197,7 +198,16 @@ class InstallCommand(Command):
         if options.download_dir:
             options.no_install = True
             options.ignore_installed = True
 -        options.build_dir = os.path.abspath(options.build_dir)
 +
 +        # If we have --no-install or --no-download and no --build we use the
 +        # legacy static build dir
 +        if (options.build_dir is None
 +                and (options.no_install or options.no_download)):
 +            options.build_dir = build_prefix
 +
 +        if options.build_dir:
 +            options.build_dir = os.path.abspath(options.build_dir)
 +
         options.src_dir = os.path.abspath(options.src_dir)
         install_options = options.install_options or []
         if options.use_user_site:
@@ -246,73 +256,75 @@ class InstallCommand(Command):
         finder = self._build_package_finder(options, index_urls, session)
 -        requirement_set = RequirementSet(
 -            build_dir=options.build_dir,
 -            src_dir=options.src_dir,
 -            download_dir=options.download_dir,
 -            download_cache=options.download_cache,
 -            upgrade=options.upgrade,
 -            as_egg=options.as_egg,
 -            ignore_installed=options.ignore_installed,
 -            ignore_dependencies=options.ignore_dependencies,
 -            force_reinstall=options.force_reinstall,
 -            use_user_site=options.use_user_site,
 -            target_dir=temp_target_dir,
 -            session=session,
 -            pycompile=options.compile,
 -        )
 -        for name in args:
 -            requirement_set.add_requirement(
 -                InstallRequirement.from_line(name, None))
 -        for name in options.editables:
 -            requirement_set.add_requirement(
 -                InstallRequirement.from_editable(name, default_vcs=options.default_vcs))
 -        for filename in options.requirements:
 -            for req in parse_requirements(filename, finder=finder, options=options, session=session):
 -                requirement_set.add_requirement(req)
 -        if not requirement_set.has_requirements:
 -            opts = {'name': self.name}
 -            if options.find_links:
 -                msg = ('You must give at least one requirement to %(name)s '
 -                       '(maybe you meant "pip %(name)s %(links)s"?)' %
 -                       dict(opts, links=' '.join(options.find_links)))
 -            else:
 -                msg = ('You must give at least one requirement '
 -                       'to %(name)s (see "pip help %(name)s")' % opts)
 -            logger.warn(msg)
 -            return
 -
 -        try:
 -            if not options.no_download:
 -                requirement_set.prepare_files(finder, force_root_egg_info=self.bundle, bundle=self.bundle)
 -            else:
 -                requirement_set.locate_files()
 -
 -            if not options.no_install and not self.bundle:
 -                requirement_set.install(
 -                    install_options,
 -                    global_options,
 -                    root=options.root_path,
 -                    strip_file_prefix=options.strip_file_prefix)
 -                installed = ' '.join([req.name for req in
 -                                      requirement_set.successfully_installed])
 -                if installed:
 -                    logger.notify('Successfully installed %s' % installed)
 -            elif not self.bundle:
 -                downloaded = ' '.join([req.name for req in
 -                                       requirement_set.successfully_downloaded])
 -                if downloaded:
 -                    logger.notify('Successfully downloaded %s' % downloaded)
 -            elif self.bundle:
 -                requirement_set.create_bundle(self.bundle_filename)
 -                logger.notify('Created bundle in %s' % self.bundle_filename)
 -        except PreviousBuildDirError:
 -            options.no_clean = True
 -            raise
 -        finally:
 -            # Clean up
 -            if (not options.no_clean) and ((not options.no_install) or options.download_dir):
 -                requirement_set.cleanup_files(bundle=self.bundle)
 +        build_delete = (not (options.no_clean or options.build_dir))
 +        with BuildDirectory(options.build_dir, delete=build_delete) as build_dir:
 +            requirement_set = RequirementSet(
 +                build_dir=build_dir,
 +                src_dir=options.src_dir,
 +                download_dir=options.download_dir,
 +                download_cache=options.download_cache,
 +                upgrade=options.upgrade,
 +                as_egg=options.as_egg,
 +                ignore_installed=options.ignore_installed,
 +                ignore_dependencies=options.ignore_dependencies,
 +                force_reinstall=options.force_reinstall,
 +                use_user_site=options.use_user_site,
 +                target_dir=temp_target_dir,
 +                session=session,
 +                pycompile=options.compile,
 +            )
 +            for name in args:
 +                requirement_set.add_requirement(
 +                    InstallRequirement.from_line(name, None))
 +            for name in options.editables:
 +                requirement_set.add_requirement(
 +                    InstallRequirement.from_editable(name, default_vcs=options.default_vcs))
 +            for filename in options.requirements:
 +                for req in parse_requirements(filename, finder=finder, options=options, session=session):
 +                    requirement_set.add_requirement(req)
 +            if not requirement_set.has_requirements:
 +                opts = {'name': self.name}
 +                if options.find_links:
 +                    msg = ('You must give at least one requirement to %(name)s '
 +                           '(maybe you meant "pip %(name)s %(links)s"?)' %
 +                           dict(opts, links=' '.join(options.find_links)))
 +                else:
 +                    msg = ('You must give at least one requirement '
 +                           'to %(name)s (see "pip help %(name)s")' % opts)
 +                logger.warn(msg)
 +                return
 +
 +            try:
 +                if not options.no_download:
 +                    requirement_set.prepare_files(finder, force_root_egg_info=self.bundle, bundle=self.bundle)
 +                else:
 +                    requirement_set.locate_files()
 +
 +                if not options.no_install and not self.bundle:
 +                    requirement_set.install(
 +                        install_options,
 +                        global_options,
 +                        root=options.root_path,
 +                        strip_file_prefix=options.strip_file_prefix)
 +                    installed = ' '.join([req.name for req in
 +                                          requirement_set.successfully_installed])
 +                    if installed:
 +                        logger.notify('Successfully installed %s' % installed)
 +                elif not self.bundle:
 +                    downloaded = ' '.join([req.name for req in
 +                                           requirement_set.successfully_downloaded])
 +                    if downloaded:
 +                        logger.notify('Successfully downloaded %s' % downloaded)
 +                elif self.bundle:
 +                    requirement_set.create_bundle(self.bundle_filename)
 +                    logger.notify('Created bundle in %s' % self.bundle_filename)
 +            except PreviousBuildDirError:
 +                options.no_clean = True
 +                raise
 +            finally:
 +                # Clean up
 +                if (not options.no_clean) and ((not options.no_install) or options.download_dir):
 +                    requirement_set.cleanup_files(bundle=self.bundle)
         if options.target_dir:
             if not os.path.exists(options.target_dir):
 diff --git a/pip/commands/wheel.py b/pip/commands/wheel.py
 index 6527063..a96631a 100644
 --- a/pip/commands/wheel.py
 +++ b/pip/commands/wheel.py
@@ -8,7 +8,7 @@ from pip.index import PackageFinder
 from pip.log import logger
 from pip.exceptions import CommandError, PreviousBuildDirError
 from pip.req import InstallRequirement, RequirementSet, parse_requirements
 -from pip.util import normalize_path
 +from pip.util import BuildDirectory, normalize_path
 from pip.wheel import WheelBuilder
 from pip import cmdoptions
@@ -123,6 +123,9 @@ class WheelCommand(Command):
                         "--extra-index-url is suggested.")
             index_urls += options.mirrors
 +        if options.build_dir:
 +            options.build_dir = os.path.abspath(options.build_dir)
 +
         session = self._build_session(options)
         finder = PackageFinder(find_links=options.find_links,
@@ -137,59 +140,60 @@ class WheelCommand(Command):
                                session=session,
                             )
 -        options.build_dir = os.path.abspath(options.build_dir)
 -        requirement_set = RequirementSet(
 -            build_dir=options.build_dir,
 -            src_dir=None,
 -            download_dir=None,
 -            download_cache=options.download_cache,
 -            ignore_dependencies=options.ignore_dependencies,
 -            ignore_installed=True,
 -            session=session,
 -            wheel_download_dir=options.wheel_dir
 -        )
 -
 -        # make the wheelhouse
 -        if not os.path.exists(options.wheel_dir):
 -            os.makedirs(options.wheel_dir)
 -
 -        #parse args and/or requirements files
 -        for name in args:
 -            requirement_set.add_requirement(
 -                InstallRequirement.from_line(name, None))
 -
 -        for filename in options.requirements:
 -            for req in parse_requirements(
 -                filename,
 -                finder=finder,
 -                options=options,
 -                session=session):
 -                if req.editable:
 -                    logger.notify("ignoring %s" % req.url)
 -                    continue
 -                requirement_set.add_requirement(req)
 -
 -        #fail if no requirements
 -        if not requirement_set.has_requirements:
 -            opts = {'name': self.name}
 -            msg = ('You must give at least one requirement '
 -                   'to %(name)s (see "pip help %(name)s")' % opts)
 -            logger.error(msg)
 -            return
 +        build_delete = (not (options.no_clean or options.build_dir))
 +        with BuildDirectory(options.build_dir, delete=build_delete) as build_dir:
 +            requirement_set = RequirementSet(
 +                build_dir=build_dir,
 +                src_dir=None,
 +                download_dir=None,
 +                download_cache=options.download_cache,
 +                ignore_dependencies=options.ignore_dependencies,
 +                ignore_installed=True,
 +                session=session,
 +                wheel_download_dir=options.wheel_dir
 +            )
 -        try:
 -            #build wheels
 -            wb = WheelBuilder(
 -                requirement_set,
 -                finder,
 -                options.wheel_dir,
 -                build_options = options.build_options or [],
 -                global_options = options.global_options or []
 -                )
 -            wb.build()
 -        except PreviousBuildDirError:
 -            options.no_clean = True
 -            raise
 -        finally:
 -            if not options.no_clean:
 -                requirement_set.cleanup_files()
 +            # make the wheelhouse
 +            if not os.path.exists(options.wheel_dir):
 +                os.makedirs(options.wheel_dir)
 +
 +            #parse args and/or requirements files
 +            for name in args:
 +                requirement_set.add_requirement(
 +                    InstallRequirement.from_line(name, None))
 +
 +            for filename in options.requirements:
 +                for req in parse_requirements(
 +                    filename,
 +                    finder=finder,
 +                    options=options,
 +                    session=session):
 +                    if req.editable:
 +                        logger.notify("ignoring %s" % req.url)
 +                        continue
 +                    requirement_set.add_requirement(req)
 +
 +            #fail if no requirements
 +            if not requirement_set.has_requirements:
 +                opts = {'name': self.name}
 +                msg = ('You must give at least one requirement '
 +                       'to %(name)s (see "pip help %(name)s")' % opts)
 +                logger.error(msg)
 +                return
 +
 +            try:
 +                #build wheels
 +                wb = WheelBuilder(
 +                    requirement_set,
 +                    finder,
 +                    options.wheel_dir,
 +                    build_options = options.build_options or [],
 +                    global_options = options.global_options or []
 +                    )
 +                wb.build()
 +            except PreviousBuildDirError:
 +                options.no_clean = True
 +                raise
 +            finally:
 +                if not options.no_clean:
 +                    requirement_set.cleanup_files()
 diff --git a/pip/util.py b/pip/util.py
 index f459bb2..f5edeeb 100644
 --- a/pip/util.py
 +++ b/pip/util.py
@@ -8,6 +8,7 @@ import zipfile
 import tarfile
 import subprocess
 import textwrap
 +import tempfile
 from pip.exceptions import InstallationError, BadCommand, PipError
 from pip.backwardcompat import(WindowsError, string_types, raw_input,
@@ -718,3 +719,35 @@ def is_prerelease(vers):
     parsed = version._normalized_key(normalized)
     return any([any([y in set(["a", "b", "c", "rc", "dev"]) for y in x]) for x in parsed])
 +
 +
 +class BuildDirectory(object):
 +
 +    def __init__(self, name=None, delete=None):
 +        # If we were not given an explicit directory, and we were not given an
 +        # explicit delete option, then we'll default to deleting.
 +        if name is None and delete is None:
 +            delete = True
 +
 +        if name is None:
 +            name = tempfile.mkdtemp(prefix="pip-build-")
 +            # If we were not given an explicit directory, and we were not given
 +            # an explicit delete option, then we'll default to deleting.
 +            if delete is None:
 +                delete = True
 +
 +        self.name = name
 +        self.delete = delete
 +
 +    def __repr__(self):
 +        return "<{} {!r}>".format(self.__class__.__name__, self.name)
 +
 +    def __enter__(self):
 +        return self.name
 +
 +    def __exit__(self, exc, value, tb):
 +        self.cleanup()
 +
 +    def cleanup(self):
 +        if self.delete:
 +            rmtree(self.name)
--- a/pip-allow-different-versions.patch
+++ b/pip-allow-different-versions.patch
@ -1,20 +0,0 @@
 --- /usr/bin/pip3	2018-03-29 15:22:13.000000000 +0200
 +++ pip3	2018-05-04 11:49:08.098821010 +0200
@@ -4,7 +4,16 @@
 import re
 import sys
 -from pip._internal import main
 +try:
 +    from pip._internal import main
 +except ImportError:
 +    # user has most probably downgraded pip in their home
 +    # so let them run it anyway until ~/.local/bin makes it in front of the PATH
 +    from pip import main
 +else:
 +    # user might also upgraded pip...
 +    if hasattr(main, 'main'):
 +        main = main.main
 if __name__ == '__main__':
     sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0])
--- a/plan.fmf
+++ b/plan.fmf
@ -0,0 +1,111 @@
 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,18 +1,9 @@
 # This is just temporary, when upstream merges PRs it can be removed
 # https://github.com/pypa/pip/pull/7959
 # https://github.com/ActiveState/appdirs/pull/144
 # https://github.com/psf/requests/pull/5410
 # https://github.com/chardet/chardet/pull/192
 addFilter(r'(non-executable-script|wrong-script-interpreter) .+/pip/_internal/__init__.py\b')
 addFilter(r'(non-executable-script|wrong-script-interpreter) .+/pip/_vendor/appdirs.py\b')
 addFilter(r'(non-executable-script|wrong-script-interpreter) .+/pip/_vendor/requests/certs.py\b')
 addFilter(r'(non-executable-script|wrong-script-interpreter) .+/pip/_vendor/chardet/cli/chardetect.py\b')
-# Already fixed upstream 
+# This file is actually a script but in the vendored context of pip, it is never executed
-addFilter(r'(non-executable-script|wrong-script-interpreter) .+/pip/_vendor/certifi/core.py\b')
+addFilter(r'non-executable-script .+/pip/_vendor/distro/distro.py\b')
 # We ship README with the main package but not with the wheel
 addFilter(r'python-pip-wheel.noarch: W: no-documentation')
 # SPELLING ERRORS
 addFilter(r'W: spelling-error .* venv')
--- a/python-pip.spec
+++ b/python-pip.spec
--- a/python39.patch
+++ b/python39.patch
@ -1,45 +0,0 @@
 From ef7ca1472c1fdd085cffb8183b7ce8abbe9e2800 Mon Sep 17 00:00:00 2001
 From: Chih-Hsuan Yen <yan12125@gmail.com>
 Date: Thu, 18 Jul 2019 12:45:15 +0800
 Subject: [PATCH] Add an html5lib patch for Python 3.9 compatibility
 The patch is adapted from https://github.com/html5lib/html5lib-python/commit/4f9235752cea29c5a31721440578b430823a1e69
 Closes https://github.com/pypa/pip/issues/6407
 Closes https://github.com/pypa/pip/issues/6237
 ---
 src/pip/_vendor/html5lib/_trie/_base.py      |  5 +++-
 src/pip/_vendor/html5lib/treebuilders/dom.py |  5 +++-
 4 files changed, 40 insertions(+), 2 deletions(-)
 diff --git a/src/pip/_vendor/html5lib/_trie/_base.py b/src/pip/_vendor/html5lib/_trie/_base.py
 index a1158bbbf..6b71975f0 100644
 --- a/src/pip/_vendor/html5lib/_trie/_base.py
 +++ b/src/pip/_vendor/html5lib/_trie/_base.py
@@ -1,6 +1,9 @@
 from __future__ import absolute_import, division, unicode_literals
 -from collections import Mapping
 +try:
 +    from collections.abc import Mapping
 +except ImportError:  # Python 2.7
 +    from collections import Mapping
 class Trie(Mapping):
 diff --git a/src/pip/_vendor/html5lib/treebuilders/dom.py b/src/pip/_vendor/html5lib/treebuilders/dom.py
 index dcfac220b..d8b530046 100644
 --- a/src/pip/_vendor/html5lib/treebuilders/dom.py
 +++ b/src/pip/_vendor/html5lib/treebuilders/dom.py
@@ -1,7 +1,10 @@
 from __future__ import absolute_import, division, unicode_literals
 -from collections import MutableMapping
 +try:
 +    from collections.abc import MutableMapping
 +except ImportError:  # Python 2.7
 +    from collections import MutableMapping
 from xml.dom import minidom, Node
 import weakref
--- a/remove-existing-dist-only-if-path-conflicts.patch
+++ b/remove-existing-dist-only-if-path-conflicts.patch
@ -1,88 +1,115 @@
-commit b6d5da6796801862eb751a93d507c343af0604d6
+From d5cb806a14bb50a96484bca6536e81f2ac316b9d Mon Sep 17 00:00:00 2001
-Author: Victor Stinner <vstinner@redhat.com>
+From: Karolina Surma <ksurma@redhat.com>
-Date:   Tue Sep 18 17:13:51 2018 +0200
+Date: Wed, 16 Feb 2022 08:36:21 +0100
 Subject: [PATCH] Prevent removing of the system packages installed under
 /usr/lib when pip install --upgrade is executed.
 MIME-Version: 1.0
 Content-Type: text/plain; charset=UTF-8
 Content-Transfer-Encoding: 8bit
-    Subject: Prevent removing of the system packages installed under /usr/lib
+Resolves: rhbz#1550368
    when pip install -U is executed.
    Resolves: rhbz#1550368
    Co-Authored-By: Michal Cyprian <m.cyprian@gmail.com>
 Co-Authored-By: Michal Cyprian <m.cyprian@gmail.com>
 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(-)
 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 d21530a..0023a35 100644
+index c9f6bff..c101826 100644
 --- a/src/pip/_internal/req/req_install.py
 +++ b/src/pip/_internal/req/req_install.py
-@@ -29,7 +29,7 @@ from pip._internal.utils.hashes import Hashes
+@@ -453,7 +453,7 @@ class InstallRequirement:
- from pip._internal.utils.logging import indent_log
+                         f"lack sys.path precedence to {existing_dist.raw_name} "
- from pip._internal.utils.misc import (
+                         f"in {existing_dist.location}"
     _make_build_dir, ask_path_exists, backup_dir, call_subprocess,
 -    display_path, dist_in_site_packages, dist_in_usersite, ensure_dir,
 +    display_path, dist_in_install_path, dist_in_site_packages, dist_in_usersite, ensure_dir,
     get_installed_version, redact_password_from_url, rmtree,
 )
 from pip._internal.utils.packaging import get_metadata
@@ -411,7 +411,7 @@ class InstallRequirement(object):
                         "lack sys.path precedence to %s in %s" %
                         (existing_dist.project_name, existing_dist.location)
                     )
 -            else:
-+            elif dist_in_install_path(existing_dist):
+            elif existing_dist.in_install_path:
-                 self.conflicts_with = existing_dist
+                 self.should_reinstall = True
-         return True
+         else:
- 
+             if self.editable:
-diff --git a/src/pip/_internal/resolve.py b/src/pip/_internal/resolve.py
+diff --git a/src/pip/_internal/resolution/legacy/resolver.py b/src/pip/_internal/resolution/legacy/resolver.py
-index 33f572f..88b68e1 100644
+index 33a4fdc..1fe886e 100644
--- a/src/pip/_internal/resolve.py
+--- a/src/pip/_internal/resolution/legacy/resolver.py
-+++ b/src/pip/_internal/resolve.py
+++ b/src/pip/_internal/resolution/legacy/resolver.py
-@@ -20,7 +20,7 @@ from pip._internal.exceptions import (
+@@ -322,7 +322,9 @@ class Resolver(BaseResolver):
 )
 from pip._internal.req.constructors import install_req_from_req_string
 from pip._internal.utils.logging import indent_log
 -from pip._internal.utils.misc import dist_in_usersite, ensure_dir
 +from pip._internal.utils.misc import dist_in_install_path, dist_in_usersite, ensure_dir
 from pip._internal.utils.packaging import check_dist_requires_python
 from pip._internal.utils.typing import MYPY_CHECK_RUNNING
@@ -154,7 +154,9 @@ class Resolver(object):
         """
         # Don't uninstall the conflict if doing a user install and the
         # conflict is not a user install.
-        if not self.use_user_site or dist_in_usersite(req.satisfied_by):
+         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))
+                or req.satisfied_by.in_usersite)
-+                and dist_in_install_path(req.satisfied_by)):
+                and req.satisfied_by.in_install_path):
-             req.conflicts_with = req.satisfied_by
+             req.should_reinstall = True
         req.satisfied_by = None
-diff --git a/src/pip/_internal/utils/misc.py b/src/pip/_internal/utils/misc.py
+diff --git a/src/pip/_internal/resolution/resolvelib/factory.py b/src/pip/_internal/resolution/resolvelib/factory.py
-index 84605ee..0e4ba93 100644
+index f23e4cd..1bada79 100644
--- a/src/pip/_internal/utils/misc.py
+--- a/src/pip/_internal/resolution/resolvelib/factory.py
-+++ b/src/pip/_internal/utils/misc.py
+++ b/src/pip/_internal/resolution/resolvelib/factory.py
-@@ -30,7 +30,7 @@ from pip._vendor.six.moves.urllib.parse import unquote as urllib_unquote
+@@ -3,6 +3,8 @@ from __future__ import annotations
- from pip._internal.exceptions import CommandError, InstallationError
+ import contextlib
- from pip._internal.locations import (
+ import functools
-     running_under_virtualenv, site_packages, user_site, virtualenv_no_global,
+ import logging
-    write_delete_marker_file,
+import sys
-+    write_delete_marker_file, distutils_scheme,
+import sysconfig
- )
+ from collections.abc import Iterable, Iterator, Mapping, Sequence
- from pip._internal.utils.compat import (
+ from typing import (
-     WINDOWS, console_to_str, expanduser, stdlib_pkgs,
+     TYPE_CHECKING,
-@@ -355,6 +355,16 @@ def dist_in_site_packages(dist):
+@@ -615,6 +617,16 @@ class Factory:
-     ).startswith(normalize_path(site_packages))
+         if dist is None:  # Not installed, no uninstallation required.
             return None
- 
+        # Prevent uninstalling packages from /usr
-+def dist_in_install_path(dist):
+        try:
-+    """
+            if dist.installed_location in (
-+    Return True if given Distribution is installed in
+                    sysconfig.get_path('purelib', scheme='posix_prefix', vars={'base': sys.base_prefix}),
-+    path matching distutils_scheme layout.
+                    sysconfig.get_path('platlib', scheme='posix_prefix', vars={'platbase': sys.base_prefix}),
-+    """
+            ):
-+    norm_path = normalize_path(dist_location(dist))
+                return None
-+    return norm_path.startswith(normalize_path(
+        except KeyError:  # this Python doesn't have 'rpm_prefix' scheme yet
-+        distutils_scheme("")['purelib'].split('python')[0]))
+            pass
 +
-+
+         # We're installing into global site. The current installation must
- def dist_is_editable(dist):
+         # be uninstalled, no matter it's in global or user site, because the
-     # type: (Distribution) -> bool
+         # user site installation has precedence over global.
-     """
+-- 
 2.50.1
--- a/requests-2.22.0.patch
+++ b/requests-2.22.0.patch
@ -1,91 +0,0 @@
 From 8e8d28dd8ecc9226ea4e0f75d54151df90f4d78e Mon Sep 17 00:00:00 2001
 From: Pradyun Gedam <pradyunsg@gmail.com>
 Date: Sat, 20 Jul 2019 09:31:48 +0530
 Subject: [PATCH] Upgrade requests to 2.22.0
 ---
 news/requests.vendor                    | 1 +
 src/pip/_vendor/requests/__init__.py    | 4 ++--
 src/pip/_vendor/requests/__version__.py | 6 +++---
 src/pip/_vendor/requests/api.py         | 4 ++--
 src/pip/_vendor/vendor.txt              | 1 +
 5 files changed, 9 insertions(+), 7 deletions(-)
 create mode 100644 news/requests.vendor
 diff --git a/news/requests.vendor b/news/requests.vendor
 new file mode 100644
 index 0000000000..aac729b0e1
 --- /dev/null
 +++ b/news/requests.vendor
@@ -0,0 +1 @@
 +Upgrade requests to 2.22.0
 diff --git a/src/pip/_vendor/requests/__init__.py b/src/pip/_vendor/requests/__init__.py
 index 80c4ce1d21..1d30e3e063 100644
 --- a/src/pip/_vendor/requests/__init__.py
 +++ b/src/pip/_vendor/requests/__init__.py
@@ -57,10 +57,10 @@ def check_compatibility(urllib3_version, chardet_version):
     # Check urllib3 for compatibility.
     major, minor, patch = urllib3_version  # noqa: F811
     major, minor, patch = int(major), int(minor), int(patch)
 -    # urllib3 >= 1.21.1, <= 1.24
 +    # urllib3 >= 1.21.1, <= 1.25
     assert major == 1
     assert minor >= 21
 -    assert minor <= 24
 +    assert minor <= 25
     # Check chardet for compatibility.
     major, minor, patch = chardet_version.split('.')[:3]
 diff --git a/src/pip/_vendor/requests/__version__.py b/src/pip/_vendor/requests/__version__.py
 index f5b5d03671..9844f740ab 100644
 --- a/src/pip/_vendor/requests/__version__.py
 +++ b/src/pip/_vendor/requests/__version__.py
@@ -5,10 +5,10 @@
 __title__ = 'requests'
 __description__ = 'Python HTTP for Humans.'
 __url__ = 'http://python-requests.org'
 -__version__ = '2.21.0'
 -__build__ = 0x022100
 +__version__ = '2.22.0'
 +__build__ = 0x022200
 __author__ = 'Kenneth Reitz'
 __author_email__ = 'me@kennethreitz.org'
 __license__ = 'Apache 2.0'
 -__copyright__ = 'Copyright 2018 Kenneth Reitz'
 +__copyright__ = 'Copyright 2019 Kenneth Reitz'
 __cake__ = u'\u2728 \U0001f370 \u2728'
 diff --git a/src/pip/_vendor/requests/api.py b/src/pip/_vendor/requests/api.py
 index abada96d46..ef71d0759e 100644
 --- a/src/pip/_vendor/requests/api.py
 +++ b/src/pip/_vendor/requests/api.py
@@ -19,7 +19,7 @@ def request(method, url, **kwargs):
     :param method: method for the new :class:`Request` object.
     :param url: URL for the new :class:`Request` object.
     :param params: (optional) Dictionary, list of tuples or bytes to send
 -        in the body of the :class:`Request`.
 +        in the query string for the :class:`Request`.
     :param data: (optional) Dictionary, list of tuples, bytes, or file-like
         object to send in the body of the :class:`Request`.
     :param json: (optional) A JSON serializable Python object to send in the body of the :class:`Request`.
@@ -65,7 +65,7 @@ def get(url, params=None, **kwargs):
     :param url: URL for the new :class:`Request` object.
     :param params: (optional) Dictionary, list of tuples or bytes to send
 -        in the body of the :class:`Request`.
 +        in the query string for the :class:`Request`.
     :param \*\*kwargs: Optional arguments that ``request`` takes.
     :return: :class:`Response <Response>` object
     :rtype: requests.Response
 diff --git a/src/pip/_vendor/vendor.txt b/src/pip/_vendor/vendor.txt
 index bcf579515e..e5542fbc5e 100644
 --- a/src/pip/_vendor/vendor.txt
 +++ b/src/pip/_vendor/vendor.txt
@@ -12,7 +12,7 @@ pep517==0.5.0
 progress==1.4
 pyparsing==2.3.1
 pytoml==0.1.20
 -requests==2.21.0
 +requests==2.22.0
     certifi==2018.11.29
     chardet==3.0.4
     idna==2.8
--- a/skip-network-tests.patch
+++ b/skip-network-tests.patch
--- a/8
+++ b/8
@ -1,3 +1,5 @@
-SHA512 (pip-19.0.3.tar.gz) = f56df1e2fe18eccc4dcba66b0a93a933eb94d12ed0f31d3923662fb85075192674c98bbc00dd48185b1d87cf28a64a6dc321de524e4ccb39a8877b3d5cf578e1
+SHA512 (pip-25.3.tar.gz) = f50db092213ec3bb819d3da5669f73d119b5ec7f7ac5e8a587a17c27eafa32bc17a057df09389c526a3769ef3577f5553187d54ceffa89aed63f4b4498ff044e
-SHA512 (d2e63fbfc62af3b7050f619b2f5bb8658985b931.tar.gz) = fc7b11c5cbf6322469ce2eaca2a8d7eb60b17398d316f7465ab5d3d38dabd00ee22a3da7437a28f6312f0115f77f2df0d8bf0abc671e055eef06356c94283409
+SHA512 (setuptools-79.0.1-py3-none-any.whl) = fef6cfc6f95a5bb7320f1680e1c665cb8d9a4e4227cde4d8aab8a50bed4bcf04320085b9d7d5343359f887008db5c5a861e57f3d08b7b0b2311a28adaeee6b4a
-SHA512 (2018.2.tar.gz) = 4c09c43a70ecb3ca3bc9445b01bf209eb382e41d9c969145696dea38551992ed88fd9b725a1264380f3dbdf8acdaf5ada3ef86b44255cdfbdbe4a01a1630912d
+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
--- a/tests/bash_completion/main.fmf
+++ b/tests/bash_completion/main.fmf
@ -0,0 +1,35 @@
 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
@ -0,0 +1,88 @@
 #!/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
@ -0,0 +1,117 @@
 #!/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
@ -0,0 +1,40 @@
 #!/bin/sh -eux
 # This script requires root privileges and you should never run it on your own machine
 test $EUID -eq 0
 PYTHON_VERSION=$(/usr/bin/python3 -c 'import sys; print("{}.{}".format(*sys.version_info))')
 RPM_SITELIB="/usr/lib/python${PYTHON_VERSION}/site-packages"
 LOCAL_SITELIB="/usr/local/lib/python${PYTHON_VERSION}/site-packages"
 USER_SITELIB="/home/fedora-test-user/.local/lib/python${PYTHON_VERSION}/site-packages"
 # First, let's install older Pello with pip as if it was installed by RPM
 # This is an approximation, but it usually works
 RPM_BUILD_ROOT=/ /usr/bin/pip install 'Pello==1.0.1'
 # Now, we'll upgrade it with regular pip
 /usr/bin/pip install --upgrade 'Pello==1.0.2'
 # pip should see it
 /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 "${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 "${LOCAL_SITELIB}/Pello-1.0.2.dist-info"
 # And pip should still see the RPM-installed one
 /usr/bin/pip freeze | grep '^Pello==1\.0\.1$'
 # Again, but as regular user
 useradd fedora-test-user
 su fedora-test-user -c '/usr/bin/pip install "Pello==1.0.2"'
 test -d "${USER_SITELIB}/Pello-1.0.2.dist-info"
 su fedora-test-user -c '/usr/bin/pip freeze' | grep '^Pello==1\.0\.2$'
 su fedora-test-user -c '/usr/bin/pip uninstall --yes Pello'
 su fedora-test-user -c '/usr/bin/pip freeze' | grep '^Pello==1\.0\.1$'
--- a/tests/tests.yml
+++ b/tests/tests.yml
@ -1,79 +0,0 @@
 ---
 - hosts: localhost
  roles:
  - role: standard-test-basic
    tags:
    - classic
    repositories:
    - repo: "https://src.fedoraproject.org/tests/python.git"
      dest: "python"
    - repo: "https://src.fedoraproject.org/rpms/pyproject-rpm-macros.git"
      dest: "pyproject-rpm-macros"
    tests:
    - smoke34:
        dir: python/smoke
        run: VERSION=3.4 ./venv.sh
    - smoke35:
        dir: python/smoke
        run: VERSION=3.5 ./venv.sh
    - smoke36:
        dir: python/smoke
        run: VERSION=3.6 ./venv.sh
    - smoke37:
        dir: python/smoke
        run: VERSION=3.7 ./venv.sh
    - smoke38:
        dir: python/smoke
        run: VERSION=3.8 ./venv.sh
    - smoke26:
        dir: python/smoke
        run: VERSION=2.6 METHOD=virtualenv TOX=false ./venv.sh
    - smoke27:
        dir: python/smoke
        run: VERSION=2.7 METHOD=virtualenv ./venv.sh
    - smoke34_virtualenv:
        dir: python/smoke
        run: VERSION=3.4 METHOD=virtualenv ./venv.sh
    - smoke35_virtualenv:
        dir: python/smoke
        run: VERSION=3.5 METHOD=virtualenv ./venv.sh
    - smoke36_virtualenv:
        dir: python/smoke
        run: VERSION=3.6 METHOD=virtualenv ./venv.sh
    - smoke37_virtualenv:
        dir: python/smoke
        run: VERSION=3.7 METHOD=virtualenv ./venv.sh
    - smoke38_virtualenv:
        dir: python/smoke
        run: VERSION=3.8 METHOD=virtualenv ./venv.sh
    - pipenv:
        run: pipenv --three && pipenv install six
    - pyproject_pytest:
        dir: pyproject-rpm-macros/tests
        run: ./mocktest.sh python-pytest
    - pyproject_entrypoints:
        dir: pyproject-rpm-macros/tests
        run: ./mocktest.sh python-entrypoints
    - pyproject_pluggy:
        dir: pyproject-rpm-macros/tests
        run: ./mocktest.sh python-pluggy
    - pyproject_clikit:
        dir: pyproject-rpm-macros/tests
        run: ./mocktest.sh python-clikit
    required_packages:
    - gcc
    - virtualenv
    - python26
    - python27
    - python34
    - python35
    - python36
    - python37
    - python38
    - python2-devel
    - python3-devel
    - python3-tox
    - pipenv
    - mock
    - rpmdevtools
    - rpm-build
--- a/urllib3-1.25.3.patch
+++ b/urllib3-1.25.3.patch
--- a/urllib3-CVE-2025-50181.patch
+++ b/urllib3-CVE-2025-50181.patch
@ -0,0 +1,51 @@
 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
--- a/vendor_meta.sh
+++ b/vendor_meta.sh
@ -1,21 +0,0 @@
 #!/usr/bin/bash -eu
 if [ $# -ne 1 ]; then
  echo "Usage: ./vendor_meta.sh pip-10.0.0/src/pip/_vendor/vendor.txt"
  exit 1
 fi
 licenses=''
 while read req; do
  req=$(echo $req | cut -f1 -d' ')
  name=$(echo $req | cut -f1 -d'=')
  version=$(echo $req | cut -f3 -d'=' | tr -d '\r')
  echo "Provides: bundled(python%{1}dist($name)) = $version"
  license="$(pyp2rpm -v ${version} --no-venv ${name} | grep '^License:' | sed -e 's/License:\s*//')"
  licenses="$licenses\n$name: $license"
 done < $1
 echo
 echo
 echo -e "$licenses"