Compare commits
1 commit
| Author | SHA1 | Date | |
|---|---|---|---|
|
14cce5a894 |
21 changed files with 1108 additions and 1266 deletions
|
|
@ -1 +0,0 @@
|
|||
1
|
||||
2
.gitignore
vendored
2
.gitignore
vendored
|
|
@ -4,4 +4,4 @@
|
|||
/pip/
|
||||
/results_python-pip/
|
||||
*.rpm
|
||||
*.whl
|
||||
|
||||
|
|
|
|||
66
11318.patch
Normal file
66
11318.patch
Normal file
|
|
@ -0,0 +1,66 @@
|
|||
From 278141678e8bac4633a0589db83f13e17ebae6d7 Mon Sep 17 00:00:00 2001
|
||||
From: q0w <43147888+q0w@users.noreply.github.com>
|
||||
Date: Thu, 28 Jul 2022 07:36:02 +0300
|
||||
Subject: [PATCH 1/3] Check if binary_executable exists
|
||||
|
||||
---
|
||||
src/pip/_internal/utils/entrypoints.py | 11 ++++++++---
|
||||
1 file changed, 8 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/src/pip/_internal/utils/entrypoints.py b/src/pip/_internal/utils/entrypoints.py
|
||||
index f292c64045b..15013693854 100644
|
||||
--- a/src/pip/_internal/utils/entrypoints.py
|
||||
+++ b/src/pip/_internal/utils/entrypoints.py
|
||||
@@ -55,9 +55,14 @@ def get_best_invocation_for_this_pip() -> str:
|
||||
if exe_are_in_PATH:
|
||||
for exe_name in _EXECUTABLE_NAMES:
|
||||
found_executable = shutil.which(exe_name)
|
||||
- if found_executable and os.path.samefile(
|
||||
- found_executable,
|
||||
- os.path.join(binary_prefix, exe_name),
|
||||
+ binary_executable = os.path.join(binary_prefix, exe_name)
|
||||
+ if (
|
||||
+ found_executable
|
||||
+ and os.path.exists(binary_executable)
|
||||
+ and os.path.samefile(
|
||||
+ found_executable,
|
||||
+ binary_executable,
|
||||
+ )
|
||||
):
|
||||
return exe_name
|
||||
|
||||
|
||||
From 0f8243ff5e81d8f905422613ea9c0f45b120b84d Mon Sep 17 00:00:00 2001
|
||||
From: q0w <43147888+q0w@users.noreply.github.com>
|
||||
Date: Thu, 28 Jul 2022 14:23:38 +0300
|
||||
Subject: [PATCH 2/3] Add news
|
||||
|
||||
---
|
||||
news/11309.bugfix.rst | 1 +
|
||||
1 file changed, 1 insertion(+)
|
||||
create mode 100644 news/11309.bugfix.rst
|
||||
|
||||
diff --git a/news/11309.bugfix.rst b/news/11309.bugfix.rst
|
||||
new file mode 100644
|
||||
index 00000000000..f59d2516eee
|
||||
--- /dev/null
|
||||
+++ b/news/11309.bugfix.rst
|
||||
@@ -0,0 +1 @@
|
||||
+Ensure that a binary executable of pip exists when checking for a new version of pip.
|
||||
|
||||
From 6354192e2ef4ab19db5ba324dfd1ef4e2c840e07 Mon Sep 17 00:00:00 2001
|
||||
From: q0w <43147888+q0w@users.noreply.github.com>
|
||||
Date: Mon, 1 Aug 2022 14:28:59 +0300
|
||||
Subject: [PATCH 3/3] Fix news
|
||||
|
||||
---
|
||||
news/11309.bugfix.rst | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/news/11309.bugfix.rst b/news/11309.bugfix.rst
|
||||
index f59d2516eee..9ee54057da4 100644
|
||||
--- a/news/11309.bugfix.rst
|
||||
+++ b/news/11309.bugfix.rst
|
||||
@@ -1 +1 @@
|
||||
-Ensure that a binary executable of pip exists when checking for a new version of pip.
|
||||
+Ensure that the candidate ``pip`` executable exists, when checking for a new version of pip.
|
||||
92
bad-metadata-fix.patch
Normal file
92
bad-metadata-fix.patch
Normal file
|
|
@ -0,0 +1,92 @@
|
|||
From 6817fbfb1fd389ad61009f0199db5670b146c8d3 Mon Sep 17 00:00:00 2001
|
||||
From: Tzu-ping Chung <uranusjr@gmail.com>
|
||||
Date: Sat, 6 Aug 2022 06:18:59 +0800
|
||||
Subject: [PATCH] Skip dist if metadata does not have a valid name
|
||||
|
||||
---
|
||||
news/11352.bugfix.rst | 2 ++
|
||||
src/pip/_internal/metadata/importlib/_compat.py | 14 +++++++++++++-
|
||||
src/pip/_internal/metadata/importlib/_envs.py | 14 +++++++++++---
|
||||
3 files changed, 26 insertions(+), 4 deletions(-)
|
||||
create mode 100644 news/11352.bugfix.rst
|
||||
|
||||
diff --git a/news/11352.bugfix.rst b/news/11352.bugfix.rst
|
||||
new file mode 100644
|
||||
index 00000000000..78016c912ef
|
||||
--- /dev/null
|
||||
+++ b/news/11352.bugfix.rst
|
||||
@@ -0,0 +1,2 @@
|
||||
+Ignore distributions with invalid ``Name`` in metadata instead of crashing, when
|
||||
+using the ``importlib.metadata`` backend.
|
||||
diff --git a/src/pip/_internal/metadata/importlib/_compat.py b/src/pip/_internal/metadata/importlib/_compat.py
|
||||
index e0879807ab9..593bff23ede 100644
|
||||
--- a/src/pip/_internal/metadata/importlib/_compat.py
|
||||
+++ b/src/pip/_internal/metadata/importlib/_compat.py
|
||||
@@ -2,6 +2,15 @@
|
||||
from typing import Any, Optional, Protocol, cast
|
||||
|
||||
|
||||
+class BadMetadata(ValueError):
|
||||
+ def __init__(self, dist: importlib.metadata.Distribution, *, reason: str) -> None:
|
||||
+ self.dist = dist
|
||||
+ self.reason = reason
|
||||
+
|
||||
+ def __str__(self) -> str:
|
||||
+ return f"Bad metadata in {self.dist} ({self.reason})"
|
||||
+
|
||||
+
|
||||
class BasePath(Protocol):
|
||||
"""A protocol that various path objects conform.
|
||||
|
||||
@@ -40,4 +49,7 @@ def get_dist_name(dist: importlib.metadata.Distribution) -> str:
|
||||
The ``name`` attribute is only available in Python 3.10 or later. We are
|
||||
targeting exactly that, but Mypy does not know this.
|
||||
"""
|
||||
- return cast(Any, dist).name
|
||||
+ name = cast(Any, dist).name
|
||||
+ if not isinstance(name, str):
|
||||
+ raise BadMetadata(dist, reason="invalid metadata entry 'name'")
|
||||
+ return name
|
||||
diff --git a/src/pip/_internal/metadata/importlib/_envs.py b/src/pip/_internal/metadata/importlib/_envs.py
|
||||
index d5fcfdbfef2..cbec59e2c6d 100644
|
||||
--- a/src/pip/_internal/metadata/importlib/_envs.py
|
||||
+++ b/src/pip/_internal/metadata/importlib/_envs.py
|
||||
@@ -1,5 +1,6 @@
|
||||
import functools
|
||||
import importlib.metadata
|
||||
+import logging
|
||||
import os
|
||||
import pathlib
|
||||
import sys
|
||||
@@ -14,9 +15,11 @@
|
||||
from pip._internal.utils.deprecation import deprecated
|
||||
from pip._internal.utils.filetypes import WHEEL_EXTENSION
|
||||
|
||||
-from ._compat import BasePath, get_dist_name, get_info_location
|
||||
+from ._compat import BadMetadata, BasePath, get_dist_name, get_info_location
|
||||
from ._dists import Distribution
|
||||
|
||||
+logger = logging.getLogger(__name__)
|
||||
+
|
||||
|
||||
def _looks_like_wheel(location: str) -> bool:
|
||||
if not location.endswith(WHEEL_EXTENSION):
|
||||
@@ -56,11 +59,16 @@ def _find_impl(self, location: str) -> Iterator[FoundResult]:
|
||||
# To know exactly where we find a distribution, we have to feed in the
|
||||
# paths one by one, instead of dumping the list to importlib.metadata.
|
||||
for dist in importlib.metadata.distributions(path=[location]):
|
||||
- normalized_name = canonicalize_name(get_dist_name(dist))
|
||||
+ info_location = get_info_location(dist)
|
||||
+ try:
|
||||
+ raw_name = get_dist_name(dist)
|
||||
+ except BadMetadata as e:
|
||||
+ logger.warning("Skipping %s due to %s", info_location, e.reason)
|
||||
+ continue
|
||||
+ normalized_name = canonicalize_name(raw_name)
|
||||
if normalized_name in self._found_names:
|
||||
continue
|
||||
self._found_names.add(normalized_name)
|
||||
- info_location = get_info_location(dist)
|
||||
yield dist, info_location
|
||||
|
||||
def find(self, location: str) -> Iterator[BaseDistribution]:
|
||||
496
changelog
496
changelog
|
|
@ -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
|
||||
|
|
@ -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
|
||||
|
||||
|
|
@ -1,103 +1,36 @@
|
|||
From 7b5fbac83944e3a0dd975ff17b69358791b68721 Mon Sep 17 00:00:00 2001
|
||||
From cacd6d2fa9a27b29415a4ce25d76406fe69fc398 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 f34045b..a2ada08 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'
|
||||
@@ -14,6 +14,7 @@ class _PipPatchedCertificate(Exception):
|
||||
|
||||
|
||||
-if sys.version_info >= (3, 11):
|
||||
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.
|
||||
@@ -75,9 +76,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() -> str:
|
||||
- f = os.path.dirname(__file__)
|
||||
-
|
||||
- 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()
|
||||
- return os.path.join(f, "cacert.pem")
|
||||
+ return '/etc/pki/tls/certs/ca-bundle.crt'
|
||||
|
||||
|
||||
def contents() -> str:
|
||||
--
|
||||
2.50.1
|
||||
2.35.3
|
||||
|
||||
|
|
|
|||
16
no-version-warning.patch
Normal file
16
no-version-warning.patch
Normal file
|
|
@ -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
|
||||
76
nowarn-pip._internal.main.patch
Normal file
76
nowarn-pip._internal.main.patch
Normal file
|
|
@ -0,0 +1,76 @@
|
|||
From 8dd3793d1bab226cec9c5c49b01718a9634bc403 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 f292c64..2e29a5e 100644
|
||||
--- a/src/pip/_internal/utils/entrypoints.py
|
||||
+++ b/src/pip/_internal/utils/entrypoints.py
|
||||
@@ -20,7 +20,7 @@ if WINDOWS:
|
||||
]
|
||||
|
||||
|
||||
-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
|
||||
@@ -32,14 +32,15 @@ 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 3e85703..f86c392 100644
|
||||
--- a/tests/functional/test_cli.py
|
||||
+++ b/tests/functional/test_cli.py
|
||||
@@ -43,4 +43,5 @@ def test_entrypoints_work(entrypoint: str, script: PipTestEnvironment) -> None:
|
||||
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.35.3
|
||||
|
||||
27
pip-allow-different-versions.patch
Normal file
27
pip-allow-different-versions.patch
Normal file
|
|
@ -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())
|
||||
111
plan.fmf
111
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
|
||||
|
|
@ -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')
|
||||
|
|
|
|||
885
python-pip.spec
885
python-pip.spec
File diff suppressed because it is too large
Load diff
|
|
@ -1,5 +1,5 @@
|
|||
From d5cb806a14bb50a96484bca6536e81f2ac316b9d Mon Sep 17 00:00:00 2001
|
||||
From: Karolina Surma <ksurma@redhat.com>
|
||||
From 2c3f3a590ddfc151a456b44a5f96f0f603d178e9 Mon Sep 17 00:00:00 2001
|
||||
From: Lumir Balhar <lbalhar@redhat.com>
|
||||
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.
|
||||
|
|
@ -23,11 +23,11 @@ Co-Authored-By: Karolina Surma <ksurma@redhat.com>
|
|||
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
|
||||
index 151fd6d..f9109cd 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
|
||||
@@ -28,7 +28,7 @@ from pip._vendor.packaging.utils import NormalizedName
|
||||
from pip._vendor.packaging.version import LegacyVersion, Version
|
||||
|
||||
from pip._internal.exceptions import NoneMetadataError
|
||||
-from pip._internal.locations import site_packages, user_site
|
||||
|
|
@ -35,7 +35,7 @@ index 230e114..8bd5d31 100644
|
|||
from pip._internal.models.direct_url import (
|
||||
DIRECT_URL_METADATA_NAME,
|
||||
DirectUrl,
|
||||
@@ -575,6 +575,16 @@ class BaseDistribution(Protocol):
|
||||
@@ -560,6 +560,16 @@ class BaseDistribution(Protocol):
|
||||
for extra in self._iter_egg_info_extras():
|
||||
metadata["Provides-Extra"] = extra
|
||||
|
||||
|
|
@ -53,10 +53,10 @@ index 230e114..8bd5d31 100644
|
|||
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 a1e376c..ed7facf 100644
|
||||
--- a/src/pip/_internal/req/req_install.py
|
||||
+++ b/src/pip/_internal/req/req_install.py
|
||||
@@ -453,7 +453,7 @@ class InstallRequirement:
|
||||
@@ -416,7 +416,7 @@ class InstallRequirement:
|
||||
f"lack sys.path precedence to {existing_dist.raw_name} "
|
||||
f"in {existing_dist.location}"
|
||||
)
|
||||
|
|
@ -66,13 +66,13 @@ index c9f6bff..c101826 100644
|
|||
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 fb49d41..040f2c1 100644
|
||||
--- a/src/pip/_internal/resolution/legacy/resolver.py
|
||||
+++ b/src/pip/_internal/resolution/legacy/resolver.py
|
||||
@@ -322,7 +322,9 @@ class Resolver(BaseResolver):
|
||||
@@ -325,7 +325,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 req.satisfied_by.in_usersite)
|
||||
|
|
@ -81,19 +81,19 @@ index 33a4fdc..1fe886e 100644
|
|||
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 a4c24b5..e7e2da9 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,
|
||||
@@ -549,6 +551,16 @@ class Factory:
|
||||
if dist is None: # Not installed, no uninstallation required.
|
||||
return None
|
||||
|
||||
|
|
@ -111,5 +111,5 @@ index f23e4cd..1bada79 100644
|
|||
# be uninstalled, no matter it's in global or user site, because the
|
||||
# user site installation has precedence over global.
|
||||
--
|
||||
2.50.1
|
||||
2.35.3
|
||||
|
||||
|
|
|
|||
6
sources
6
sources
|
|
@ -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-22.2.2.tar.gz) = bd59e28b55475b77a8f11ea771cbad3b2602ff974e219f9a55288963a9522c9279a5b00fde40fb65cfebefae0e905d3da3c06fe50b402aa5326b25f70a98a015
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
@ -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!"
|
||||
|
|
@ -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!"
|
||||
|
||||
|
|
@ -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
|
||||
|
|
|
|||
92
tests/tests.yml
Normal file
92
tests/tests.yml
Normal file
|
|
@ -0,0 +1,92 @@
|
|||
---
|
||||
- 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
|
||||
- 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
|
||||
- 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-devel
|
||||
- python3.11-devel
|
||||
- python2-devel
|
||||
- python3-devel
|
||||
- python3-tox
|
||||
- pipenv
|
||||
- mock
|
||||
- rpmdevtools
|
||||
- rpm-build
|
||||
- grep
|
||||
- util-linux
|
||||
- shadow-utils
|
||||
|
|
@ -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
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue