Compare commits
192 commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2b2a030e77 | ||
|
|
1f462a281f | ||
|
|
584939ebdd | ||
|
|
566ed62a19 | ||
|
|
8ddd39d6cd | ||
|
|
e2a1a1a994 | ||
|
|
3a83d6ce5d | ||
|
|
13d07e4daf | ||
|
|
c830f0f9ae | ||
|
|
69759f2972 | ||
|
|
cea7bb935f | ||
|
|
685d136d85 | ||
|
|
c61c7b352c | ||
|
|
5802dc6818 | ||
|
|
435a2e9aa1 | ||
|
|
6c37700fd5 | ||
|
|
1ae9237431 | ||
|
|
2b190b00bf | ||
|
|
b0472d2883 | ||
|
|
8e291b0b6c | ||
|
|
b4fe5333a1 | ||
|
|
f467900a68 | ||
|
|
2fbd290be0 | ||
|
|
8390734c31 | ||
|
|
be112f861a | ||
|
|
274df105b5 | ||
|
|
d4edbde902 | ||
|
|
8c346262d5 | ||
|
|
97a9e3e215 | ||
|
|
d681b5b429 | ||
|
|
048126313b | ||
|
|
10e0ef58aa | ||
|
|
990a77f1c0 | ||
|
|
533a4ecd2d | ||
|
|
476f824742 | ||
|
|
4965892859 | ||
|
|
858b6685fa | ||
|
|
09c6b24cb0 | ||
|
|
f0db4e7df0 | ||
|
|
f7056f5f8a | ||
|
|
77a1a20083 | ||
|
|
454b4fe562 | ||
|
|
bac2129304 | ||
|
|
3dcabb5165 | ||
|
|
05483f6f20 | ||
|
|
531939a7ca | ||
|
|
af4d3ddf26 | ||
|
|
8a984c4565 | ||
|
|
30632b6e8c | ||
|
|
4899b5284a | ||
|
|
3c290026a9 | ||
|
|
b582198d1c | ||
|
|
bd7e7a076a | ||
|
|
9cd97d1338 | ||
|
|
2a7f383501 | ||
|
|
26b3caa925 |
||
|
|
e286eac28b | ||
|
|
b9cefb7bc1 |
||
|
|
0cc1518397 | ||
|
|
6648d06bdf | ||
|
|
e03098bace | ||
|
|
be83e98e05 | ||
|
|
fb213c6f74 | ||
|
|
432aea6d5c | ||
|
|
da117b5316 | ||
|
|
960d5f25da | ||
|
|
e82cd73bd4 | ||
|
|
3292de8e3b | ||
|
|
72a236c147 | ||
|
|
8b06ef16f8 | ||
|
|
558f1a0e2b | ||
|
|
a378787915 | ||
|
|
f58b7e613e | ||
|
|
384163c9b7 | ||
|
|
a2d6e7ddd8 | ||
|
|
f657771b14 | ||
|
|
83fe8f1d73 | ||
|
|
7fdfa3a50a | ||
|
|
6cbe3a846c | ||
|
|
a1e1c1dfc9 | ||
|
|
25bc125898 | ||
|
|
c3f04d6b6d | ||
|
|
a2dfa8738e | ||
|
|
ca7bb6bb48 | ||
|
|
9361272bc9 | ||
|
|
6300db47ba | ||
|
|
3e8bb70757 | ||
|
|
d6c837fe66 | ||
|
|
2c59c720fb | ||
|
|
9f67b4d1a3 | ||
|
|
b0f90f583c | ||
|
|
5a8c8943b0 | ||
|
|
1963d79695 | ||
|
|
590775acbf | ||
|
|
093cb73c53 | ||
|
|
636f3bf0bd | ||
|
|
b4e24c5cb6 | ||
|
|
931a7e69a1 | ||
|
|
5e3e97d02b | ||
|
|
20ae7fd440 | ||
|
|
54943ebf8a | ||
|
|
05b44649bb | ||
|
|
8b7935f5a8 | ||
|
|
27c255ce81 | ||
|
|
192c4aebdf | ||
|
|
d7a96d26f4 | ||
|
|
d3f6b95d9c | ||
|
|
8f31f816cc | ||
|
|
d39c496473 | ||
|
|
08464d3bcd | ||
|
|
44c8353812 | ||
|
|
de909508e7 | ||
|
|
d2309d3f09 | ||
|
|
ec8cee20b2 | ||
|
|
4e92c5da5b | ||
|
|
34ceb80d61 | ||
|
|
5afdc00b06 | ||
|
|
695f7debe3 | ||
|
|
b476c02485 | ||
|
|
e8f3551533 | ||
|
|
093819ce2e | ||
|
|
b650cd95c0 | ||
|
|
cef1efc8a0 | ||
|
|
cae1e54349 | ||
|
|
05d68e041f | ||
|
|
6eac568430 | ||
|
|
0626df487e | ||
|
|
58c5acd7e8 | ||
|
|
f444f50981 | ||
|
|
e8ba55beb4 | ||
|
|
79b09f862d | ||
|
|
32ac5407bd | ||
|
|
aab1da4a87 | ||
|
|
8825fe54dc | ||
|
|
9a044bd673 | ||
|
|
588f123d93 | ||
|
|
728b4e49d0 | ||
|
|
21fe0a233c | ||
|
|
159feb818e | ||
|
|
e195c51818 | ||
|
|
8253bfab57 | ||
|
|
acf982e208 | ||
|
|
230ac9caa8 | ||
|
|
97bba91589 | ||
|
|
5ef43e57f4 | ||
|
|
0e2a444500 | ||
|
|
55406531cf | ||
|
|
e858da1425 | ||
|
|
9d1451298e | ||
|
|
46e383d546 | ||
|
|
db4c30e311 | ||
|
|
f6c63603fb | ||
|
|
903b01b22d | ||
|
|
542eb0faf8 | ||
|
|
4347c1397d | ||
|
|
7913cd9edf | ||
|
|
eb1cbbd764 | ||
|
|
abb97d98f6 | ||
|
|
f994ff1cc7 | ||
|
|
c9ae810483 | ||
|
|
184dcf3cac | ||
|
|
af087f8054 | ||
|
|
f6e9c0640b | ||
|
|
3bced42530 | ||
|
|
add791f1d5 | ||
|
|
a0ac853b8c | ||
|
|
9a8a1ef98e | ||
|
|
ef07805c26 | ||
|
|
1e1292bcb1 | ||
|
|
0f902d1fc0 | ||
|
|
07e4cb7088 | ||
|
|
30557cd2a5 | ||
|
|
36d098078c | ||
|
|
b5e9f71561 | ||
|
|
776d4ae9a3 | ||
|
|
8fc8d4526b | ||
|
|
5813f49ff1 | ||
|
|
23345c5b9c | ||
|
|
853f763a7e | ||
|
|
de5ce17674 | ||
|
|
fa2f84fe5b | ||
|
|
a2422cfdac | ||
|
|
9f86bca8b1 | ||
|
|
7093fad249 | ||
|
|
53928d9a4a | ||
|
|
85a78b8c13 | ||
|
|
038fce3b5d | ||
|
|
bbe9e6d297 | ||
|
|
3af98288df | ||
|
|
047f5659ab | ||
|
|
c75c71ee16 | ||
|
|
1d76c3e182 |
23 changed files with 1467 additions and 2378 deletions
1
.fmf/version
Normal file
1
.fmf/version
Normal file
|
|
@ -0,0 +1 @@
|
||||||
|
1
|
||||||
37
.gitignore
vendored
37
.gitignore
vendored
|
|
@ -1,30 +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
|
|
||||||
|
|
|
||||||
|
|
@ -1,91 +0,0 @@
|
||||||
diff --git a/src/pip/_internal/commands/install.py b/src/pip/_internal/commands/install.py
|
|
||||||
index 6fc178f..1279d4a 100644
|
|
||||||
--- a/src/pip/_internal/commands/install.py
|
|
||||||
+++ b/src/pip/_internal/commands/install.py
|
|
||||||
@@ -115,6 +115,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())
|
|
||||||
|
|
||||||
@@ -364,6 +372,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 c2624fe..922d10c 100644
|
|
||||||
--- a/src/pip/_internal/req/req_install.py
|
|
||||||
+++ b/src/pip/_internal/req/req_install.py
|
|
||||||
@@ -370,7 +370,7 @@ class InstallRequirement(object):
|
|
||||||
|
|
||||||
def move_wheel_files(self, wheeldir, root=None, home=None, prefix=None,
|
|
||||||
warn_script_location=True, use_user_site=False,
|
|
||||||
- pycompile=True):
|
|
||||||
+ pycompile=True, strip_file_prefix=None):
|
|
||||||
move_wheel_files(
|
|
||||||
self.name, self.req, wheeldir,
|
|
||||||
user=use_user_site,
|
|
||||||
@@ -380,6 +380,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
|
|
||||||
@@ -743,7 +744,7 @@ class InstallRequirement(object):
|
|
||||||
|
|
||||||
def install(self, install_options, global_options=None, root=None,
|
|
||||||
home=None, prefix=None, warn_script_location=True,
|
|
||||||
- use_user_site=False, pycompile=True):
|
|
||||||
+ use_user_site=False, pycompile=True, strip_file_prefix=None):
|
|
||||||
global_options = global_options if global_options is not None else []
|
|
||||||
if self.editable:
|
|
||||||
self.install_editable(
|
|
||||||
@@ -758,6 +759,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 5ce890e..c42d77a 100644
|
|
||||||
--- a/src/pip/_internal/wheel.py
|
|
||||||
+++ b/src/pip/_internal/wheel.py
|
|
||||||
@@ -206,7 +206,7 @@ def message_about_scripts_not_on_PATH(scripts):
|
|
||||||
|
|
||||||
def move_wheel_files(name, req, wheeldir, user=False, home=None, root=None,
|
|
||||||
pycompile=True, scheme=None, isolated=False, prefix=None,
|
|
||||||
- warn_script_location=True):
|
|
||||||
+ warn_script_location=True, strip_file_prefix=None):
|
|
||||||
"""Install a wheel"""
|
|
||||||
|
|
||||||
if not scheme:
|
|
||||||
@@ -508,7 +508,11 @@ if __name__ == '__main__':
|
|
||||||
outrows.append(tuple(row))
|
|
||||||
for f in generated:
|
|
||||||
digest, length = rehash(f)
|
|
||||||
- outrows.append((normpath(f, lib_dir), digest, 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))
|
|
||||||
+ outrows.append((final_path, digest, length))
|
|
||||||
for f in installed:
|
|
||||||
outrows.append((installed[f], '', ''))
|
|
||||||
for row in sorted(outrows):
|
|
||||||
496
changelog
Normal file
496
changelog
Normal file
|
|
@ -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
|
||||||
54
downstream-remove-pytest-subket.patch
Normal file
54
downstream-remove-pytest-subket.patch
Normal file
|
|
@ -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
|
||||||
|
|
||||||
103
dummy-certifi.patch
Normal file
103
dummy-certifi.patch
Normal file
|
|
@ -0,0 +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 2f2f7e0..bec6595 100644
|
||||||
|
--- a/src/pip/_vendor/certifi/core.py
|
||||||
|
+++ b/src/pip/_vendor/certifi/core.py
|
||||||
|
@@ -4,80 +4,12 @@ certifi.py
|
||||||
|
|
||||||
|
This module returns the installation location of cacert.pem or its contents.
|
||||||
|
"""
|
||||||
|
-import sys
|
||||||
|
-import atexit
|
||||||
|
|
||||||
|
-def exit_cacert_ctx() -> None:
|
||||||
|
- _CACERT_CTX.__exit__(None, None, None) # type: ignore[union-attr]
|
||||||
|
+# The RPM-packaged certifi always uses the system certificates
|
||||||
|
+def where() -> str:
|
||||||
|
+ return '/etc/pki/ca-trust/extracted/pem/tls-ca-bundle.pem'
|
||||||
|
|
||||||
|
|
||||||
|
-if sys.version_info >= (3, 11):
|
||||||
|
-
|
||||||
|
- from importlib.resources import as_file, files
|
||||||
|
-
|
||||||
|
- _CACERT_CTX = None
|
||||||
|
- _CACERT_PATH = None
|
||||||
|
-
|
||||||
|
- def where() -> str:
|
||||||
|
- # This is slightly terrible, but we want to delay extracting the file
|
||||||
|
- # in cases where we're inside of a zipimport situation until someone
|
||||||
|
- # actually calls where(), but we don't want to re-extract the file
|
||||||
|
- # on every call of where(), so we'll do it once then store it in a
|
||||||
|
- # global variable.
|
||||||
|
- global _CACERT_CTX
|
||||||
|
- global _CACERT_PATH
|
||||||
|
- if _CACERT_PATH is None:
|
||||||
|
- # This is slightly janky, the importlib.resources API wants you to
|
||||||
|
- # manage the cleanup of this file, so it doesn't actually return a
|
||||||
|
- # path, it returns a context manager that will give you the path
|
||||||
|
- # when you enter it and will do any cleanup when you leave it. In
|
||||||
|
- # the common case of not needing a temporary file, it will just
|
||||||
|
- # return the file system location and the __exit__() is a no-op.
|
||||||
|
- #
|
||||||
|
- # We also have to hold onto the actual context manager, because
|
||||||
|
- # it will do the cleanup whenever it gets garbage collected, so
|
||||||
|
- # we will also store that at the global level as well.
|
||||||
|
- _CACERT_CTX = as_file(files("pip._vendor.certifi").joinpath("cacert.pem"))
|
||||||
|
- _CACERT_PATH = str(_CACERT_CTX.__enter__())
|
||||||
|
- atexit.register(exit_cacert_ctx)
|
||||||
|
-
|
||||||
|
- return _CACERT_PATH
|
||||||
|
-
|
||||||
|
- def contents() -> str:
|
||||||
|
- return files("pip._vendor.certifi").joinpath("cacert.pem").read_text(encoding="ascii")
|
||||||
|
-
|
||||||
|
-else:
|
||||||
|
-
|
||||||
|
- from importlib.resources import path as get_path, read_text
|
||||||
|
-
|
||||||
|
- _CACERT_CTX = None
|
||||||
|
- _CACERT_PATH = None
|
||||||
|
-
|
||||||
|
- def where() -> str:
|
||||||
|
- # This is slightly terrible, but we want to delay extracting the
|
||||||
|
- # file in cases where we're inside of a zipimport situation until
|
||||||
|
- # someone actually calls where(), but we don't want to re-extract
|
||||||
|
- # the file on every call of where(), so we'll do it once then store
|
||||||
|
- # it in a global variable.
|
||||||
|
- global _CACERT_CTX
|
||||||
|
- global _CACERT_PATH
|
||||||
|
- if _CACERT_PATH is None:
|
||||||
|
- # This is slightly janky, the importlib.resources API wants you
|
||||||
|
- # to manage the cleanup of this file, so it doesn't actually
|
||||||
|
- # return a path, it returns a context manager that will give
|
||||||
|
- # you the path when you enter it and will do any cleanup when
|
||||||
|
- # you leave it. In the common case of not needing a temporary
|
||||||
|
- # file, it will just return the file system location and the
|
||||||
|
- # __exit__() is a no-op.
|
||||||
|
- #
|
||||||
|
- # We also have to hold onto the actual context manager, because
|
||||||
|
- # it will do the cleanup whenever it gets garbage collected, so
|
||||||
|
- # we will also store that at the global level as well.
|
||||||
|
- _CACERT_CTX = get_path("pip._vendor.certifi", "cacert.pem")
|
||||||
|
- _CACERT_PATH = str(_CACERT_CTX.__enter__())
|
||||||
|
- atexit.register(exit_cacert_ctx)
|
||||||
|
-
|
||||||
|
- return _CACERT_PATH
|
||||||
|
-
|
||||||
|
- def contents() -> str:
|
||||||
|
- return read_text("pip._vendor.certifi", "cacert.pem", encoding="ascii")
|
||||||
|
+def contents() -> str:
|
||||||
|
+ with open(where(), encoding='utf=8') as data:
|
||||||
|
+ return data.read()
|
||||||
|
--
|
||||||
|
2.50.1
|
||||||
|
|
||||||
|
|
@ -1,34 +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,20 @@ 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():
|
|
||||||
+ logger.warning(
|
|
||||||
+ "WARNING: Running pip install with root privileges is "
|
|
||||||
+ "generally not a good idea. Try `%s install --user` instead."
|
|
||||||
+ % path.basename(sys.argv[0])
|
|
||||||
+ )
|
|
||||||
+
|
|
||||||
upgrade_strategy = "to-satisfy-only"
|
|
||||||
if options.upgrade:
|
|
||||||
upgrade_strategy = options.upgrade_strategy
|
|
||||||
|
|
@ -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
|
|
||||||
395
local-dos.patch
395
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)
|
|
||||||
|
|
@ -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])
|
|
||||||
111
plan.fmf
Normal file
111
plan.fmf
Normal file
|
|
@ -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
|
||||||
9
python-pip.rpmlintrc
Normal file
9
python-pip.rpmlintrc
Normal file
|
|
@ -0,0 +1,9 @@
|
||||||
|
# This is just temporary, when upstream merges PRs it can be removed
|
||||||
|
# https://github.com/psf/requests/pull/5410
|
||||||
|
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')
|
||||||
|
|
||||||
|
# We ship README with the main package but not with the wheel
|
||||||
|
addFilter(r'python-pip-wheel.noarch: W: no-documentation')
|
||||||
840
python-pip.spec
840
python-pip.spec
|
|
@ -1,118 +1,115 @@
|
||||||
%bcond_with bootstrap
|
# The original RHEL N+1 content set is defined by (build)dependencies
|
||||||
%bcond_without tests
|
# of the packages in Fedora ELN. Hence we disable tests here
|
||||||
|
# to prevent pulling many unwanted packages in.
|
||||||
%bcond_without python2
|
%bcond tests %{defined fedora}
|
||||||
%bcond_without doc
|
# Whether to build the manual pages (useful for bootstrapping Sphinx)
|
||||||
|
%bcond man 1
|
||||||
|
|
||||||
%global srcname pip
|
%global srcname pip
|
||||||
%global python_wheelname %{srcname}-%{version}-py2.py3-none-any.whl
|
%global base_version 25.3
|
||||||
%global python_wheeldir %{_datadir}/python-wheels
|
%global upstream_version %{base_version}%{?prerel}
|
||||||
|
%global python_wheel_name %{srcname}-%{upstream_version}-py3-none-any.whl
|
||||||
%if %{with doc}
|
|
||||||
%global pypa_theme_commit_hash d2e63fbfc62af3b7050f619b2f5bb8658985b931
|
|
||||||
%endif
|
|
||||||
|
|
||||||
# Note that with disabled python3, bashcomp2 will be disabled as well because
|
|
||||||
# bashcompdir will point to a different path than with python3 enabled.
|
|
||||||
%global bashcompdir %(b=$(pkg-config --variable=completionsdir bash-completion 2>/dev/null); echo ${b:-%{_sysconfdir}/bash_completion.d})
|
|
||||||
%if "%{bashcompdir}" != "%{_sysconfdir}/bash_completion.d"
|
|
||||||
%global bashcomp2 1
|
|
||||||
%endif
|
|
||||||
|
|
||||||
Name: python-%{srcname}
|
Name: python-%{srcname}
|
||||||
# When updating, update the bundled libraries versions bellow!
|
Version: %{base_version}%{?prerel:~%{prerel}}
|
||||||
# You can use vendor_meta.sh in the dist git repo
|
Release: %autorelease
|
||||||
Version: 18.1
|
|
||||||
Release: 2%{?dist}
|
|
||||||
Summary: A tool for installing and managing Python packages
|
Summary: A tool for installing and managing Python packages
|
||||||
|
|
||||||
# We bundle a lot of libraries with pip, which itself is under MIT license.
|
# We bundle a lot of libraries with pip, which itself is under MIT license.
|
||||||
# Here is the list of the libraries with corresponding licenses:
|
# Here is the list of the libraries with corresponding licenses:
|
||||||
|
|
||||||
# appdirs: MIT
|
# certifi: MPL-2.0
|
||||||
# distlib: Python
|
# CacheControl: Apache-2.0
|
||||||
# distro: ASL 2.0
|
# dependency-groups: MIT
|
||||||
# html5lib: MIT
|
# distlib: Python-2.0.1
|
||||||
# six: MIT
|
# distro: Apache-2.0
|
||||||
# colorama: BSD
|
# idna: BSD-3-Clause
|
||||||
# CacheControl: ASL 2.0
|
# msgpack: Apache-2.0
|
||||||
# msgpack-python: ASL 2.0
|
# packaging: Apache-2.0 OR BSD-2-Clause
|
||||||
# lockfile: MIT
|
# platformdirs: MIT
|
||||||
# progress: ISC
|
# pygments: BSD-2-Clause
|
||||||
# ipaddress: Python
|
# pyproject-hooks: MIT
|
||||||
# packaging: ASL 2.0 or BSD
|
# requests: Apache-2.0
|
||||||
# pep517: MIT
|
# resolvelib: ISC
|
||||||
# pyparsing: MIT
|
# rich: MIT
|
||||||
# pytoml: MIT
|
|
||||||
# retrying: ASL 2.0
|
|
||||||
# requests: ASL 2.0
|
|
||||||
# chardet: LGPLv2
|
|
||||||
# idna: BSD
|
|
||||||
# urllib3: MIT
|
|
||||||
# certifi: MPLv2.0
|
|
||||||
# setuptools: MIT
|
# setuptools: MIT
|
||||||
# webencodings: BSD
|
# truststore: MIT
|
||||||
|
# tomli: MIT
|
||||||
|
# tomli-w: MIT
|
||||||
|
# urllib3: MIT
|
||||||
|
|
||||||
License: MIT and Python and ASL 2.0 and BSD and ISC and LGPLv2 and MPLv2.0 and (ASL 2.0 or BSD)
|
License: MIT AND Python-2.0.1 AND Apache-2.0 AND BSD-2-Clause AND BSD-3-Clause AND ISC AND MPL-2.0 AND (Apache-2.0 OR BSD-2-Clause)
|
||||||
URL: http://www.pip-installer.org
|
URL: https://pip.pypa.io/
|
||||||
Source0: %pypi_source
|
Source0: https://github.com/pypa/pip/archive/%{upstream_version}/%{srcname}-%{upstream_version}.tar.gz
|
||||||
|
|
||||||
|
# The following sources are wheels used only for tests.
|
||||||
|
# They are not bundled in the built package and do not contribute to the overall license.
|
||||||
|
# They are pre-built but only contain text files, rebuilding them in %%build has very little benefit.
|
||||||
|
|
||||||
|
# setuptools.whl
|
||||||
|
# We cannot use RPM-packaged python-setuptools-wheel because upstream pins to <80.
|
||||||
|
# See https://github.com/pypa/pip/pull/13357 for rationale.
|
||||||
|
Source1: https://files.pythonhosted.org/packages/0d/6d/b4752b044bf94cb802d88a888dc7d288baaf77d7910b7dedda74b5ceea0c/setuptools-79.0.1-py3-none-any.whl
|
||||||
|
|
||||||
|
# wheel.whl
|
||||||
|
# We cannot use RPM-packaged python-wheel-wheel because we intent to drop that package in wheel 0.46+.
|
||||||
|
# That version of wheel has runtime dependencies and is generally useless as a standalone wheel.
|
||||||
|
# See https://github.com/pypa/pip/pull/13382 as an attempt to drop the requirement from pip tests.
|
||||||
|
Source2: https://files.pythonhosted.org/packages/0b/2c/87f3254fd8ffd29e4c02732eee68a83a1d3c346ae39bc6822dcbcb697f2b/wheel-0.45.1-py3-none-any.whl
|
||||||
|
|
||||||
|
# flit_core.whl
|
||||||
|
# This is not built as RPM-packaged wheel in Fedora at all.
|
||||||
|
Source3: https://files.pythonhosted.org/packages/f2/65/b6ba90634c984a4fcc02c7e3afe523fef500c4980fec67cc27536ee50acf/flit_core-3.12.0-py3-none-any.whl
|
||||||
|
|
||||||
|
# coverage.whl
|
||||||
|
# There is no RPM-packaged python-coverage-wheel, the package is archful.
|
||||||
|
# Upstream uses this to measure coverage, which we don't.
|
||||||
|
# This is a dummy placeholder package that only contains empty coverage.process_startup().
|
||||||
|
# That way, we don't need to patch the usage out of conftest.py.
|
||||||
|
Source4: coverage-0-py3-none-any.whl
|
||||||
|
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
%if %{with tests}
|
%if %{with tests}
|
||||||
BuildRequires: /usr/bin/git
|
BuildRequires: /usr/bin/git
|
||||||
|
BuildRequires: /usr/bin/hg
|
||||||
BuildRequires: /usr/bin/bzr
|
BuildRequires: /usr/bin/bzr
|
||||||
BuildRequires: /usr/bin/svn
|
BuildRequires: /usr/bin/svn
|
||||||
|
BuildRequires: python%{python3_pkgversion}-pytest-xdist
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# to get tests:
|
%if %{with man}
|
||||||
# git clone https://github.com/pypa/pip && cd pip
|
# docs/requirements.txt contains many sphinx extensions
|
||||||
# git checkout $VERSION && tar -czvf ../pip-$VERSION-tests.tar.gz tests/
|
# however, we only build the manual pages thanks to
|
||||||
%if %{with tests}
|
# https://github.com/pypa/pip/pull/13168
|
||||||
Source1: pip-%{version}-tests.tar.gz
|
# We also always use the "main" Sphinx, not python%%{python3_pkgversion}-sphinx
|
||||||
|
BuildRequires: python3-sphinx
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# Themes required to build the docs.
|
|
||||||
%if %{with doc}
|
|
||||||
Source2: https://github.com/pypa/pypa-docs-theme/archive/%{pypa_theme_commit_hash}.tar.gz
|
|
||||||
Source3: https://github.com/python/python-docs-theme/archive/2018.2.tar.gz
|
|
||||||
%endif
|
|
||||||
|
|
||||||
# Patch until the following issue gets implemented upstream:
|
|
||||||
# https://github.com/pypa/pip/issues/1351
|
|
||||||
Patch0: allow-stripping-given-prefix-from-wheel-RECORD-files.patch
|
|
||||||
|
|
||||||
# Downstream only patch
|
|
||||||
# Emit a warning to the user if pip install is run with root privileges
|
|
||||||
# Issue upstream: https://github.com/pypa/pip/issues/4288
|
|
||||||
Patch1: emit-a-warning-when-running-with-root-privileges.patch
|
|
||||||
|
|
||||||
# Add path to the doc themes to conf.py
|
|
||||||
Patch2: html_theme_path.patch
|
|
||||||
|
|
||||||
# Prevent removing of the system packages installed under /usr/lib
|
# Prevent removing of the system packages installed under /usr/lib
|
||||||
# when pip install -U is executed.
|
# when pip install -U is executed.
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1550368#c24
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1550368#c24
|
||||||
Patch3: remove-existing-dist-only-if-path-conflicts.patch
|
# Could be replaced with https://www.python.org/dev/peps/pep-0668/
|
||||||
|
Patch: remove-existing-dist-only-if-path-conflicts.patch
|
||||||
|
|
||||||
# Downstream only patch
|
# Use the system level root certificate instead of the one bundled in certifi
|
||||||
# Users might have local installations of pip from using
|
# https://bugzilla.redhat.com/show_bug.cgi?id=1655253
|
||||||
# `pip install --user --upgrade pip` on older/newer versions.
|
# The same patch is a part of the RPM-packaged python-certifi
|
||||||
# If they do that and they run `pip` or `pip3`, the one from /usr/bin is used.
|
Patch: dummy-certifi.patch
|
||||||
# However that's the one from this RPM package and the import in there might
|
|
||||||
# fail (it tries to import from ~/.local, but older or newer pip is there with
|
# pytest-subket has been introduced to intercept network calls
|
||||||
# a bit different API).
|
# https://github.com/pypa/pip/commit/a4b40f62332ccb3228b12cc5ae1493c75177247a
|
||||||
# We add this patch as a dirty workaround to make /usr/bin/pip* work with
|
# We don't need a layer to check that, as we're by default in an offline environment
|
||||||
# both pip10+ (from this RPM) and older or newer (19.3+) pip (from whatever).
|
Patch: downstream-remove-pytest-subket.patch
|
||||||
# A proper fix is to put ~/.local/bin in front of /usr/bin in the PATH,
|
|
||||||
# however others are against that and we cannot change it for existing
|
# Patch for the bundled urllib3 for CVE-2025-50181
|
||||||
# installs/user homes anyway.
|
# Redirects are not disabled when retries are disabled on PoolManager instantiation
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1569488
|
# Upstream fix: https://github.com/urllib3/urllib3/commit/f05b1329126d5be6de501f9d1e3e36738bc08857
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1571650
|
Patch: urllib3-CVE-2025-50181.patch
|
||||||
# https://bugzilla.redhat.com/show_bug.cgi?id=1767212
|
|
||||||
# WARNING: /usr/bin/pip* are entrypoints, this cannot be applied in %%prep!
|
# Remove -s from Python shebang - ensure that packages installed with pip
|
||||||
# %%patch10 doesn't work outside of %%prep, so we add it as a source
|
# to user locations are seen by pip itself
|
||||||
Source10: pip-allow-different-versions.patch
|
%undefine _py3_shebang_s
|
||||||
|
|
||||||
%description
|
%description
|
||||||
pip is a package management system used to install and manage software packages
|
pip is a package management system used to install and manage software packages
|
||||||
|
|
@ -123,93 +120,70 @@ Packages" or "Pip Installs Python".
|
||||||
|
|
||||||
|
|
||||||
# Virtual provides for the packages bundled by pip.
|
# Virtual provides for the packages bundled by pip.
|
||||||
# You can find the versions in pip/_vendor/vendor.txt file.
|
# You can generate it with:
|
||||||
|
# %%{_rpmconfigdir}/pythonbundles.py --namespace 'python%%{1}dist' src/pip/_vendor/vendor.txt
|
||||||
%global bundled() %{expand:
|
%global bundled() %{expand:
|
||||||
Provides: bundled(python%{1}dist(appdirs)) = 1.4.3
|
Provides: bundled(python%{1}dist(cachecontrol)) = 0.14.3
|
||||||
Provides: bundled(python%{1}dist(distlib)) = 0.2.7
|
Provides: bundled(python%{1}dist(certifi)) = 2025.10.5
|
||||||
Provides: bundled(python%{1}dist(distro)) = 1.3.0
|
Provides: bundled(python%{1}dist(dependency-groups)) = 1.3.1
|
||||||
Provides: bundled(python%{1}dist(html5lib)) = 1.0.1
|
Provides: bundled(python%{1}dist(distlib)) = 0.4
|
||||||
Provides: bundled(python%{1}dist(six)) = 1.11.0
|
Provides: bundled(python%{1}dist(distro)) = 1.9
|
||||||
Provides: bundled(python%{1}dist(colorama)) = 0.3.9
|
Provides: bundled(python%{1}dist(idna)) = 3.10
|
||||||
Provides: bundled(python%{1}dist(CacheControl)) = 0.12.5
|
Provides: bundled(python%{1}dist(msgpack)) = 1.1.2
|
||||||
Provides: bundled(python%{1}dist(msgpack-python)) = 0.5.6
|
Provides: bundled(python%{1}dist(packaging)) = 25
|
||||||
Provides: bundled(python%{1}dist(lockfile)) = 0.12.2
|
Provides: bundled(python%{1}dist(platformdirs)) = 4.5
|
||||||
Provides: bundled(python%{1}dist(progress)) = 1.4
|
Provides: bundled(python%{1}dist(pygments)) = 2.19.2
|
||||||
Provides: bundled(python%{1}dist(ipaddress)) = 1.0.22
|
Provides: bundled(python%{1}dist(pyproject-hooks)) = 1.2
|
||||||
Provides: bundled(python%{1}dist(packaging)) = 18.0
|
Provides: bundled(python%{1}dist(requests)) = 2.32.5
|
||||||
Provides: bundled(python%{1}dist(pep517)) = 0.2
|
Provides: bundled(python%{1}dist(resolvelib)) = 1.2.1
|
||||||
Provides: bundled(python%{1}dist(pyparsing)) = 2.2.1
|
Provides: bundled(python%{1}dist(rich)) = 14.2
|
||||||
Provides: bundled(python%{1}dist(pytoml)) = 0.1.19
|
Provides: bundled(python%{1}dist(setuptools)) = 70.3
|
||||||
Provides: bundled(python%{1}dist(retrying)) = 1.3.3
|
Provides: bundled(python%{1}dist(tomli)) = 2.3
|
||||||
Provides: bundled(python%{1}dist(requests)) = 2.19.1
|
Provides: bundled(python%{1}dist(tomli-w)) = 1.2
|
||||||
Provides: bundled(python%{1}dist(chardet)) = 3.0.4
|
Provides: bundled(python%{1}dist(truststore)) = 0.10.4
|
||||||
Provides: bundled(python%{1}dist(idna)) = 2.7
|
Provides: bundled(python%{1}dist(urllib3)) = 1.26.20
|
||||||
Provides: bundled(python%{1}dist(urllib3)) = 1.23
|
|
||||||
Provides: bundled(python%{1}dist(certifi)) = 2018.8.24
|
|
||||||
Provides: bundled(python%{1}dist(setuptools)) = 40.4.3
|
|
||||||
Provides: bundled(python%{1}dist(webencodings)) = 0.5.1
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
# Some manylinux1 wheels need libcrypt.so.1.
|
||||||
|
# Manylinux1, a common (as of 2019) platform tag for binary wheels, relies
|
||||||
|
# on a glibc version that included ancient crypto functions, which were
|
||||||
|
# moved to libxcrypt and then removed in:
|
||||||
|
# https://fedoraproject.org/wiki/Changes/FullyRemoveDeprecatedAndUnsafeFunctionsFromLibcrypt
|
||||||
|
# The manylinux1 standard assumed glibc would keep ABI compatibility,
|
||||||
|
# but that's only the case if libcrypt.so.1 (libxcrypt-compat) is around.
|
||||||
|
# This should be solved in the next manylinux standard (but it may be
|
||||||
|
# a long time until manylinux1 is phased out).
|
||||||
|
# See: https://github.com/pypa/manylinux/issues/305
|
||||||
|
# Note that manylinux is only applicable to x86 (both 32 and 64 bits)
|
||||||
|
# As of Python 3.12, we no longer use this,
|
||||||
|
# see https://discuss.python.org/t/29455/
|
||||||
|
# However, we keep it around for previous Python versions that use the wheel package.
|
||||||
|
%global crypt_compat_recommends() %{expand:
|
||||||
|
Recommends: (libcrypt.so.1()(64bit) if python%{1}(x86-64))
|
||||||
|
Recommends: (libcrypt.so.1 if python%{1}(x86-32))
|
||||||
|
}
|
||||||
|
|
||||||
%if %{with python2}
|
|
||||||
%package -n python2-%{srcname}
|
|
||||||
Summary: A tool for installing and managing Python 2 packages
|
|
||||||
BuildRequires: python2-devel
|
|
||||||
BuildRequires: python2-setuptools
|
|
||||||
%if %{with tests}
|
|
||||||
BuildRequires: python2-mock
|
|
||||||
BuildRequires: python2-pytest
|
|
||||||
BuildRequires: python2-pretend
|
|
||||||
BuildRequires: python2-freezegun
|
|
||||||
BuildRequires: python2-scripttest
|
|
||||||
BuildRequires: python2-virtualenv
|
|
||||||
BuildRequires: python2-pyyaml
|
|
||||||
%endif
|
|
||||||
%if %{without bootstrap}
|
|
||||||
BuildRequires: python2-pip
|
|
||||||
BuildRequires: python2-wheel
|
|
||||||
%endif
|
|
||||||
Requires: python2-setuptools
|
|
||||||
|
|
||||||
# Virtual provides for the packages bundled by pip:
|
|
||||||
%{bundled 2}
|
|
||||||
|
|
||||||
%{?python_provide:%python_provide python2-%{srcname}}
|
|
||||||
|
|
||||||
%description -n python2-%{srcname}
|
|
||||||
pip is a package management system used to install and manage software packages
|
|
||||||
written in Python. Many packages can be found in the Python Package Index
|
|
||||||
(PyPI). pip is a recursive acronym that can stand for either "Pip Installs
|
|
||||||
Packages" or "Pip Installs Python".
|
|
||||||
|
|
||||||
%endif # with python2
|
|
||||||
|
|
||||||
|
|
||||||
%package -n python%{python3_pkgversion}-%{srcname}
|
%package -n python%{python3_pkgversion}-%{srcname}
|
||||||
Summary: A tool for installing and managing Python3 packages
|
Summary: A tool for installing and managing Python3 packages
|
||||||
|
|
||||||
BuildRequires: python%{python3_pkgversion}-devel
|
BuildRequires: python%{python3_pkgversion}-devel
|
||||||
BuildRequires: python%{python3_pkgversion}-setuptools
|
# python3 bootstrap: this is rebuilt before the final build of python3, which
|
||||||
|
# adds the dependency on python3-rpm-generators, so we require it manually
|
||||||
|
# Note that the package prefix is always python3-, even if we build for 3.X
|
||||||
|
# The minimal version is for bundled provides verification script
|
||||||
|
BuildRequires: python3-rpm-generators >= 11-8
|
||||||
|
BuildRequires: pyproject-rpm-macros
|
||||||
|
BuildRequires: python%{python3_pkgversion}-flit-core
|
||||||
BuildRequires: bash-completion
|
BuildRequires: bash-completion
|
||||||
%if %{with tests}
|
BuildRequires: ca-certificates
|
||||||
BuildRequires: python%{python3_pkgversion}-mock
|
Requires: ca-certificates
|
||||||
BuildRequires: python%{python3_pkgversion}-pytest
|
|
||||||
BuildRequires: python%{python3_pkgversion}-pretend
|
|
||||||
BuildRequires: python%{python3_pkgversion}-freezegun
|
|
||||||
BuildRequires: python%{python3_pkgversion}-scripttest
|
|
||||||
BuildRequires: python%{python3_pkgversion}-virtualenv
|
|
||||||
BuildRequires: python%{python3_pkgversion}-pyyaml
|
|
||||||
%endif
|
|
||||||
%if %{without bootstrap}
|
|
||||||
BuildRequires: python%{python3_pkgversion}-pip
|
|
||||||
BuildRequires: python%{python3_pkgversion}-wheel
|
|
||||||
%endif
|
|
||||||
Requires: python%{python3_pkgversion}-setuptools
|
|
||||||
|
|
||||||
# Virtual provides for the packages bundled by pip:
|
# Virtual provides for the packages bundled by pip:
|
||||||
%{bundled 3}
|
%{bundled %{python3_pkgversion}}
|
||||||
|
|
||||||
%{?python_provide:%python_provide python%{python3_pkgversion}-%{srcname}}
|
Provides: pip = %{version}-%{release}
|
||||||
|
|
||||||
%description -n python%{python3_pkgversion}-%{srcname}
|
%description -n python%{python3_pkgversion}-%{srcname}
|
||||||
pip is a package management system used to install and manage software packages
|
pip is a package management system used to install and manage software packages
|
||||||
|
|
@ -217,489 +191,173 @@ written in Python. Many packages can be found in the Python Package Index
|
||||||
(PyPI). pip is a recursive acronym that can stand for either "Pip Installs
|
(PyPI). pip is a recursive acronym that can stand for either "Pip Installs
|
||||||
Packages" or "Pip Installs Python".
|
Packages" or "Pip Installs Python".
|
||||||
|
|
||||||
%if %{with doc}
|
|
||||||
%package doc
|
|
||||||
Summary: A documentation for a tool for installing and managing Python packages
|
|
||||||
|
|
||||||
BuildRequires: python%{python3_pkgversion}-sphinx
|
%package -n %{python_wheel_pkg_prefix}-%{srcname}-wheel
|
||||||
|
|
||||||
%description doc
|
|
||||||
A documentation for a tool for installing and managing Python packages
|
|
||||||
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if %{without bootstrap}
|
|
||||||
%package wheel
|
|
||||||
Summary: The pip wheel
|
Summary: The pip wheel
|
||||||
|
Requires: ca-certificates
|
||||||
|
|
||||||
# Virtual provides for the packages bundled by pip:
|
# Virtual provides for the packages bundled by pip:
|
||||||
%{bundled 2}
|
%{bundled %{python3_pkgversion}}
|
||||||
%{bundled 3}
|
|
||||||
|
|
||||||
%description wheel
|
# This is only relevant for Pythons that are older than 3.12 and don't use their own bundled wheels
|
||||||
A Python wheel of pip to use with venv.
|
# It is also only relevant when this wheel is shared across multiple Pythons
|
||||||
|
%if "%{python_wheel_pkg_prefix}" == "python"
|
||||||
|
%{crypt_compat_recommends 3.11}
|
||||||
|
%{crypt_compat_recommends 3.10}
|
||||||
|
%{crypt_compat_recommends 3.9}
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
%description -n %{python_wheel_pkg_prefix}-%{srcname}-wheel
|
||||||
|
A Python wheel of pip to use with venv.
|
||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q -n %{srcname}-%{version}
|
%autosetup -p1 -n %{srcname}-%{upstream_version}
|
||||||
|
|
||||||
|
# this goes together with patch4
|
||||||
|
rm src/pip/_vendor/certifi/*.pem
|
||||||
|
|
||||||
|
# Remove windows executable binaries
|
||||||
|
rm -v src/pip/_vendor/distlib/*.exe
|
||||||
|
sed -i '/\.exe/d' pyproject.toml
|
||||||
|
|
||||||
|
# Remove unused test requirements
|
||||||
|
sed -Ei '/(pytest-(cov|xdist|rerunfailures|subket)|proxy\.py)/d' pyproject.toml
|
||||||
|
|
||||||
|
# Remove unused pytest-subket options
|
||||||
|
sed -Ei '/(--disable-socket|--allow-unix-socket|--allow-hosts=localhost)/d' pyproject.toml
|
||||||
|
|
||||||
%if %{with tests}
|
%if %{with tests}
|
||||||
tar -xf %{SOURCE1}
|
# tests expect wheels in here
|
||||||
%endif
|
mkdir tests/data/common_wheels
|
||||||
%if %{with doc}
|
cp -a %{SOURCE1} %{SOURCE2} %{SOURCE3} %{SOURCE4} tests/data/common_wheels
|
||||||
pushd docs/html
|
|
||||||
tar -xf %{SOURCE2}
|
|
||||||
mv pypa-docs-theme-%{pypa_theme_commit_hash} pypa
|
|
||||||
tar -xf %{SOURCE3}
|
|
||||||
mv python-docs-theme-2018.2 python-docs-theme
|
|
||||||
popd
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
%patch0 -p1
|
|
||||||
%patch1 -p1
|
%if %{with tests}
|
||||||
%patch2 -p1
|
%generate_buildrequires
|
||||||
%patch3 -p1
|
# we only use this to generate test requires
|
||||||
|
# the "pyproject" part is explicitly disabled as it generates a requirement on pip
|
||||||
|
%pyproject_buildrequires -N -g test
|
||||||
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%if %{with python2} && %{with bootstrap}
|
|
||||||
%py2_build
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if %{without bootstrap}
|
|
||||||
%py3_build_wheel
|
|
||||||
%else
|
|
||||||
%py3_build
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if %{with doc}
|
|
||||||
export PYTHONPATH=./src/
|
export PYTHONPATH=./src/
|
||||||
# from tox.ini
|
%pyproject_wheel
|
||||||
sphinx-build-3 -b html docs/html docs/build/html
|
|
||||||
sphinx-build-3 -b man docs/man docs/build/man -c docs/html
|
%if %{with man}
|
||||||
rm docs/build/html/.buildinfo
|
sphinx-build -t man -b man -d docs/build/doctrees/man -c docs/html docs/man docs/build/man
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%if %{without bootstrap}
|
export PYTHONPATH=./src/
|
||||||
%py3_install_wheel %{python_wheelname}
|
%pyproject_install
|
||||||
|
%pyproject_save_files -l pip
|
||||||
|
|
||||||
|
# We'll install pip as pip3.X
|
||||||
|
# Later we'll provide symbolic links, manpage links and bashcompletion fixes for alternative names
|
||||||
|
%if "%{python3_pkgversion}" == "3"
|
||||||
|
%global alternate_names pip-%{python3_version} pip-3 pip3 pip
|
||||||
%else
|
%else
|
||||||
%py3_install
|
%global alternate_names pip-%{python3_version}
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
# TODO: we have to remove this by hand now, but it'd be nice if we wouldn't have to
|
# Provide symlinks to executables
|
||||||
# (pip install wheel doesn't overwrite)
|
mv %{buildroot}%{_bindir}/pip %{buildroot}%{_bindir}/pip%{python3_version}
|
||||||
rm %{buildroot}%{_bindir}/pip
|
rm %{buildroot}%{_bindir}/pip3
|
||||||
|
for pip in %{alternate_names}; do
|
||||||
|
ln -s ./pip%{python3_version} %{buildroot}%{_bindir}/$pip
|
||||||
|
done
|
||||||
|
|
||||||
%if %{with doc}
|
%if %{with man}
|
||||||
pushd docs/build/man
|
pushd docs/build/man
|
||||||
install -d %{buildroot}%{_mandir}/man1
|
install -d %{buildroot}%{_mandir}/man1
|
||||||
for MAN in *1; do
|
for MAN in *1; do
|
||||||
%if %{with python2}
|
install -pm0644 $MAN %{buildroot}%{_mandir}/man1/${MAN/pip/pip%{python3_version}}
|
||||||
install -pm0644 $MAN %{buildroot}%{_mandir}/man1/$MAN
|
for pip in %{alternate_names}; do
|
||||||
install -pm0644 $MAN %{buildroot}%{_mandir}/man1/${MAN/pip/pip2}
|
echo ".so ${MAN/pip/pip%{python3_version}}" > %{buildroot}%{_mandir}/man1/${MAN/pip/$pip}
|
||||||
%endif
|
done
|
||||||
install -pm0644 $MAN %{buildroot}%{_mandir}/man1/${MAN/pip/pip3}
|
|
||||||
done
|
done
|
||||||
popd
|
popd
|
||||||
%endif # with doc
|
|
||||||
|
|
||||||
%if %{with python2}
|
|
||||||
%if %{without bootstrap}
|
|
||||||
%py2_install_wheel %{python_wheelname}
|
|
||||||
%else
|
|
||||||
%py2_install
|
|
||||||
%endif
|
|
||||||
%endif # with python2
|
|
||||||
|
|
||||||
# before we ln -s anything, we apply Source10 patch to all pips:
|
|
||||||
# we don't do this when bootstrapping because the entrypoints look different
|
|
||||||
# this is not worth dealing with because we'll rebuild once more anyway
|
|
||||||
%if %{without bootstrap}
|
|
||||||
for PIP in %{buildroot}%{_bindir}/pip*; do
|
|
||||||
patch -p1 $PIP < %{SOURCE10}
|
|
||||||
done
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
mkdir -p %{buildroot}%{bashcompdir}
|
mkdir -p %{buildroot}%{bash_completions_dir}
|
||||||
%if %{with python2}
|
|
||||||
PYTHONPATH=%{buildroot}%{python2_sitelib} \
|
|
||||||
%{buildroot}%{_bindir}/pip completion --bash \
|
|
||||||
> %{buildroot}%{bashcompdir}/pip
|
|
||||||
%endif
|
|
||||||
PYTHONPATH=%{buildroot}%{python3_sitelib} \
|
PYTHONPATH=%{buildroot}%{python3_sitelib} \
|
||||||
%{buildroot}%{_bindir}/pip3 completion --bash \
|
%{buildroot}%{_bindir}/pip%{python3_version} completion --bash \
|
||||||
> %{buildroot}%{bashcompdir}/pip3
|
> %{buildroot}%{bash_completions_dir}/pip%{python3_version}
|
||||||
pips2=pip
|
|
||||||
pips3=pip3
|
|
||||||
for pip in %{buildroot}%{_bindir}/pip*; do
|
|
||||||
pip=$(basename $pip)
|
|
||||||
case $pip in
|
|
||||||
%if %{with python2}
|
|
||||||
pip2*)
|
|
||||||
pips2="$pips2 $pip"
|
|
||||||
%if 0%{?bashcomp2}
|
|
||||||
ln -s pip %{buildroot}%{bashcompdir}/$pip
|
|
||||||
%endif
|
|
||||||
;;
|
|
||||||
%endif
|
|
||||||
pip3?*)
|
|
||||||
pips3="$pips3 $pip"
|
|
||||||
%if 0%{?bashcomp2}
|
|
||||||
ln -s pip3 %{buildroot}%{bashcompdir}/$pip
|
|
||||||
%endif
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
sed -i -e "s/^\\(complete.*\\) pip\$/\\1 $pips3/" \
|
|
||||||
-e s/_pip_completion/_pip3_completion/ \
|
|
||||||
%{buildroot}%{bashcompdir}/pip3
|
|
||||||
|
|
||||||
%if %{with python2}
|
# Make bash completion apply to all alternate names symlinks we install
|
||||||
sed -i -e "s/^\\(complete.*\\) pip\$/\\1 $pips2/" \
|
sed -i -e "s/^\\(complete.*\\) pip%{python3_version}\$/\\1 pip%{python3_version} %{alternate_names}/" \
|
||||||
%{buildroot}%{bashcompdir}/pip
|
-e s/_pip_completion/_pip%{python3_version_nodots}_completion/ \
|
||||||
%endif
|
%{buildroot}%{bash_completions_dir}/pip%{python3_version}
|
||||||
|
|
||||||
# Provide symlinks to executables to comply with Fedora guidelines for Python
|
# Install the built wheel and inject SBOM into it (if the macro is available)
|
||||||
%if %{with python2}
|
mkdir -p %{buildroot}%{python_wheel_dir}
|
||||||
ln -s ./pip%{python2_version} %{buildroot}%{_bindir}/pip-%{python2_version}
|
install -p %{_pyproject_wheeldir}/%{python_wheel_name} -t %{buildroot}%{python_wheel_dir}
|
||||||
ln -s ./pip-%{python2_version} %{buildroot}%{_bindir}/pip-2
|
%{?python_wheel_inject_sbom:%python_wheel_inject_sbom %{buildroot}%{python_wheel_dir}/%{python_wheel_name}}
|
||||||
%endif
|
|
||||||
|
|
||||||
ln -s ./pip%{python3_version} %{buildroot}%{_bindir}/pip-%{python3_version}
|
|
||||||
ln -s ./pip-%{python3_version} %{buildroot}%{_bindir}/pip-3
|
|
||||||
|
|
||||||
|
|
||||||
# Make sure the INSTALLER is not pip, otherwise Patch2 won't work
|
%check
|
||||||
# TODO Maybe we should make all our python packages have this?
|
# Verify bundled provides are up to date
|
||||||
%if %{without bootstrap}
|
%{_rpmconfigdir}/pythonbundles.py src/pip/_vendor/vendor.txt --compare-with '%{bundled 3}'
|
||||||
%if %{with python2}
|
|
||||||
echo rpm > %{buildroot}%{python2_sitelib}/pip-%{version}.dist-info/INSTALLER
|
|
||||||
%endif
|
|
||||||
|
|
||||||
echo rpm > %{buildroot}%{python3_sitelib}/pip-%{version}.dist-info/INSTALLER
|
# Verify no unwanted files are present in the package
|
||||||
%endif
|
grep "exe$" %{pyproject_files} && exit 1 || true
|
||||||
|
grep "pem$" %{pyproject_files} && exit 1 || true
|
||||||
%if %{without bootstrap}
|
|
||||||
mkdir -p %{buildroot}%{python_wheeldir}
|
|
||||||
install -p dist/%{python_wheelname} -t %{buildroot}%{python_wheeldir}
|
|
||||||
%endif
|
|
||||||
|
|
||||||
|
# Verify we can at least run basic commands without crashing
|
||||||
|
%{py3_test_envvars} %{buildroot}%{_bindir}/pip%{python3_version} --help
|
||||||
|
%{py3_test_envvars} %{buildroot}%{_bindir}/pip%{python3_version} list
|
||||||
|
%{py3_test_envvars} %{buildroot}%{_bindir}/pip%{python3_version} show pip
|
||||||
|
|
||||||
%if %{with tests}
|
%if %{with tests}
|
||||||
%check
|
# Upstream tests
|
||||||
export PYTHONPATH=src
|
|
||||||
|
|
||||||
mkdir _bin
|
|
||||||
export PATH="$PWD/_bin:$PATH"
|
|
||||||
|
|
||||||
|
|
||||||
# bash completion tests only work from installed package
|
# bash completion tests only work from installed package
|
||||||
# test_yaml_based, test_uninstall_non_local_distutils, test_venv_modification, test_freeze_git_clone_srcdir are failing TODO investigate
|
pytest_k='not completion'
|
||||||
# other deselected tests download setuptools and wheel from the interwebs and are not marked as network
|
# this clashes with our PYTHONPATH
|
||||||
%global pytest_k 'not completion and not test_pep518 and not test_install_with_target_and_scripts_no_warning and not test_install_incompatible_python_requires and not test_install_compatible_python_requires and not test_wheel_exit_status_code_when_no_requirements and not test_wheel_exit_status_code_when_blank_requirements_file and not test_constraints_local_editable_install_pep518 and not test_constraints_local_editable_install_pep518 and not test_wheel_exit_status_code_when_blank_requirements_file and not test_yaml_based and not test_uninstall_non_local_distutils and not test_venv_modification and not test_freeze_git_clone_srcdir and not test_upgrade_argparse_shadowed'
|
pytest_k="$pytest_k and not environments_with_no_pip"
|
||||||
|
# this seems to require internet (despite no network marker)
|
||||||
|
# added in https://github.com/pypa/pip/pull/13378 TODO drop this in the next release
|
||||||
|
pytest_k="$pytest_k and not test_prompt_for_keyring_if_needed and not test_double_install_fail and not test_install_sdist_links and not test_lock_vcs and not test_lock_archive and not test_backend_sees_config_via_sdist"
|
||||||
|
# this cannot import breezy, TODO investigate
|
||||||
|
pytest_k="$pytest_k and not (functional and bazaar)"
|
||||||
|
# failures to investigate
|
||||||
|
pytest_k="$pytest_k and not test_all_fields and not test_report_mixed_not_found and not test_basic_show" # "Editable project location" missing
|
||||||
|
pytest_k="$pytest_k and not test_basic_install_from_wheel"
|
||||||
|
pytest_k="$pytest_k and not test_check_unsupported"
|
||||||
|
|
||||||
%if %{with python2}
|
%pytest -n auto -m 'not network' -k "$(echo $pytest_k)" \
|
||||||
ln -s %{buildroot}%{_bindir}/pip2 _bin/pip
|
--ignore tests/functional/test_proxy.py # no proxy.py in Fedora
|
||||||
%{__python2} -m pytest -m 'not network' -k %{pytest_k}
|
|
||||||
%endif
|
%endif
|
||||||
|
|
||||||
|
|
||||||
ln -sf %{buildroot}%{_bindir}/pip3 _bin/pip
|
%files -n python%{python3_pkgversion}-%{srcname} -f %{pyproject_files}
|
||||||
%{__python3} -m pytest -m 'not network' -k %{pytest_k}
|
|
||||||
%endif
|
|
||||||
|
|
||||||
|
|
||||||
%if %{with python2}
|
|
||||||
%files -n python2-%{srcname}
|
|
||||||
%license LICENSE.txt
|
|
||||||
%doc README.rst
|
%doc README.rst
|
||||||
%if %{with doc}
|
%if %{with man}
|
||||||
%{_mandir}/man1/pip.*
|
%if "%{python3_pkgversion}" == "3"
|
||||||
%{_mandir}/man1/pip2.*
|
%{_mandir}/man1/pip{,3,-3}.1.*
|
||||||
|
%{_mandir}/man1/pip{,3,-3}-[^3]*.1.*
|
||||||
%endif
|
%endif
|
||||||
|
%{_mandir}/man1/pip{,-}%{python3_version}.1.*
|
||||||
|
%{_mandir}/man1/pip{,-}%{python3_version}-*.1.*
|
||||||
|
%endif
|
||||||
|
%if "%{python3_pkgversion}" == "3"
|
||||||
%{_bindir}/pip
|
%{_bindir}/pip
|
||||||
%{_bindir}/pip2
|
|
||||||
%{_bindir}/pip-2
|
|
||||||
%{_bindir}/pip%{python2_version}
|
|
||||||
%{_bindir}/pip-%{python2_version}
|
|
||||||
%{python2_sitelib}/pip*
|
|
||||||
%dir %{bashcompdir}
|
|
||||||
%{bashcompdir}/pip
|
|
||||||
%if 0%{?bashcomp2}
|
|
||||||
%{bashcompdir}/pip2*
|
|
||||||
%dir %(dirname %{bashcompdir})
|
|
||||||
%endif
|
|
||||||
%endif # with python2
|
|
||||||
|
|
||||||
%files -n python%{python3_pkgversion}-%{srcname}
|
|
||||||
%license LICENSE.txt
|
|
||||||
%doc README.rst
|
|
||||||
%if %{with doc}
|
|
||||||
%{_mandir}/man1/pip3.*
|
|
||||||
%endif
|
|
||||||
%{_bindir}/pip3
|
%{_bindir}/pip3
|
||||||
%{_bindir}/pip-3
|
%{_bindir}/pip-3
|
||||||
|
%endif
|
||||||
%{_bindir}/pip%{python3_version}
|
%{_bindir}/pip%{python3_version}
|
||||||
%{_bindir}/pip-%{python3_version}
|
%{_bindir}/pip-%{python3_version}
|
||||||
%{python3_sitelib}/pip*
|
%dir %{bash_completions_dir}
|
||||||
%dir %{bashcompdir}
|
%{bash_completions_dir}/pip%{python3_version}
|
||||||
%{bashcompdir}/pip3*
|
|
||||||
%if 0%{?bashcomp2}
|
|
||||||
%dir %(dirname %{bashcompdir})
|
|
||||||
%endif
|
|
||||||
|
|
||||||
%if %{with doc}
|
|
||||||
%files doc
|
|
||||||
%license LICENSE.txt
|
|
||||||
%doc README.rst
|
|
||||||
%doc docs/build/html
|
|
||||||
%endif # with doc
|
|
||||||
|
|
||||||
%if %{without bootstrap}
|
%files -n %{python_wheel_pkg_prefix}-%{srcname}-wheel
|
||||||
%files wheel
|
|
||||||
%license LICENSE.txt
|
%license LICENSE.txt
|
||||||
# we own the dir for simplicity
|
# we own the dir for simplicity
|
||||||
%dir %{python_wheeldir}/
|
%dir %{python_wheel_dir}/
|
||||||
%{python_wheeldir}/%{python_wheelname}
|
%{python_wheel_dir}/%{python_wheel_name}
|
||||||
%endif
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
* Mon Nov 11 2019 Miro Hrončok <mhroncok@redhat.com> - 18.1-2
|
%autochangelog
|
||||||
- Make /usr/bin/pip(2|3) work with user-installed pip 19.3+ (#1767212)
|
|
||||||
|
|
||||||
* 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,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
|
diff --git a/src/pip/_internal/req/req_install.py b/src/pip/_internal/req/req_install.py
|
||||||
index 922d10c..6f73f33 100644
|
index c9f6bff..c101826 100644
|
||||||
--- a/src/pip/_internal/req/req_install.py
|
--- a/src/pip/_internal/req/req_install.py
|
||||||
+++ b/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, rmtree,
|
|
||||||
)
|
|
||||||
from pip._internal.utils.packaging import get_metadata
|
|
||||||
@@ -359,7 +359,7 @@ class InstallRequirement(object):
|
|
||||||
"lack sys.path precedence to %s in %s" %
|
|
||||||
(existing_dist.project_name, existing_dist.location)
|
|
||||||
)
|
)
|
||||||
- else:
|
- 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 2d9f1c5..4ad9e77 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
|
|
||||||
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
|
|
||||||
|
|
||||||
logger = logging.getLogger(__name__)
|
|
||||||
@@ -123,7 +123,9 @@ class Resolver(object):
|
|
||||||
"""
|
|
||||||
# Don't uninstall the conflict if doing a user install and the
|
# Don't uninstall the conflict if doing a user install and the
|
||||||
# conflict is not a user install.
|
# 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
|
+ 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
|
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 84a421f..c879a21 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
|
||||||
@@ -29,7 +29,7 @@ from pip._vendor.six.moves.urllib import parse as urllib_parse
|
@@ -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,
|
||||||
@@ -328,6 +328,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
|
||||||
"""Is distribution an editable install?"""
|
# user site installation has precedence over global.
|
||||||
for path_item in sys.path:
|
--
|
||||||
|
2.50.1
|
||||||
|
|
||||||
|
|
|
||||||
File diff suppressed because it is too large
Load diff
9
sources
9
sources
|
|
@ -1,4 +1,5 @@
|
||||||
SHA512 (pip-18.1.tar.gz) = f13c129675f2de7f8bc10cfd0d49fc5c650cf59825282c3311c15841bca904604fe78a28d9b48f1c8fa4486826ac3d7d7362cec7a4631715b71b0928b48fff1d
|
SHA512 (pip-25.3.tar.gz) = f50db092213ec3bb819d3da5669f73d119b5ec7f7ac5e8a587a17c27eafa32bc17a057df09389c526a3769ef3577f5553187d54ceffa89aed63f4b4498ff044e
|
||||||
SHA512 (pip-18.1-tests.tar.gz) = c1afa128e883c4bf1ebe1696c81e1bc2299010e43d6be01164359ee164b2b56c787b912d923b669b0ddc5efca77d7f7956f17737d1d378d8ba571695c09082d1
|
SHA512 (setuptools-79.0.1-py3-none-any.whl) = fef6cfc6f95a5bb7320f1680e1c665cb8d9a4e4227cde4d8aab8a50bed4bcf04320085b9d7d5343359f887008db5c5a861e57f3d08b7b0b2311a28adaeee6b4a
|
||||||
SHA512 (d2e63fbfc62af3b7050f619b2f5bb8658985b931.tar.gz) = fc7b11c5cbf6322469ce2eaca2a8d7eb60b17398d316f7465ab5d3d38dabd00ee22a3da7437a28f6312f0115f77f2df0d8bf0abc671e055eef06356c94283409
|
SHA512 (wheel-0.45.1-py3-none-any.whl) = 86c16248ec804ee0ac95d43b03d47351dceb534d0cdc4025ca1eb073e39e539de44c870b9261f0373144e1537f0e42675a759a318a8d5d346bbd9efcb704061d
|
||||||
SHA512 (2018.2.tar.gz) = 4c09c43a70ecb3ca3bc9445b01bf209eb382e41d9c969145696dea38551992ed88fd9b725a1264380f3dbdf8acdaf5ada3ef86b44255cdfbdbe4a01a1630912d
|
SHA512 (flit_core-3.12.0-py3-none-any.whl) = 790c12b1f43201e365fb3f8f2f0a54e1a578876799dfdf8bfeea679a25ea096bf62946d006618c1458ae6e37ce6d00998f37e9aba426d5ab80d32ef2d75da4e0
|
||||||
|
SHA512 (coverage-0-py3-none-any.whl) = e734192565347010efe68f8ba600254259c9b647f3c553fd4e5d87b1d7f955cb15d6f7d807716f4a6415d239beed945fbec7210feaf502e9cc849c332845926e
|
||||||
|
|
|
||||||
35
tests/bash_completion/main.fmf
Normal file
35
tests/bash_completion/main.fmf
Normal file
|
|
@ -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
|
||||||
88
tests/bash_completion/pip_completion_full_test.sh
Executable file
88
tests/bash_completion/pip_completion_full_test.sh
Executable file
|
|
@ -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!"
|
||||||
117
tests/bash_completion/test_pip_completion.exp
Executable file
117
tests/bash_completion/test_pip_completion.exp
Executable file
|
|
@ -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!"
|
||||||
|
|
||||||
40
tests/pip_install_upgrade/runtest.sh
Executable file
40
tests/pip_install_upgrade/runtest.sh
Executable file
|
|
@ -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$'
|
||||||
|
|
@ -1,52 +0,0 @@
|
||||||
---
|
|
||||||
- hosts: localhost
|
|
||||||
roles:
|
|
||||||
- role: standard-test-basic
|
|
||||||
tags:
|
|
||||||
- classic
|
|
||||||
repositories:
|
|
||||||
- repo: "https://src.fedoraproject.org/tests/python.git"
|
|
||||||
dest: "python"
|
|
||||||
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
|
|
||||||
- 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
|
|
||||||
required_packages:
|
|
||||||
- gcc
|
|
||||||
- /usr/bin/virtualenv
|
|
||||||
- python26
|
|
||||||
- python27
|
|
||||||
- python34
|
|
||||||
- python35
|
|
||||||
- python36
|
|
||||||
- python37
|
|
||||||
- python2-devel
|
|
||||||
- python3-devel
|
|
||||||
- python3-tox
|
|
||||||
51
urllib3-CVE-2025-50181.patch
Normal file
51
urllib3-CVE-2025-50181.patch
Normal file
|
|
@ -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
|
||||||
|
|
||||||
|
|
@ -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"
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue