Skip to content

Commit 6e54491

Browse files
dirkmuellerbmwiedemann
authored andcommitted
Update python-pip to version 22.0.4 / rev 56 via SR 994298
https://build.opensuse.org/request/show/994298 by user dirkmueller + dimstar_suse - skip subversion tests, not that relevant to pull in dozens of dependencies into small bootstrap - Add distutils-reproducible-compile.patch to make installed files ordered correctly and thus builds reproducible again (port of the fix for bpo#29708 and gh#python/cpython#8057).
1 parent 15cfb4d commit 6e54491

5 files changed

Lines changed: 45 additions & 2 deletions

File tree

‎packages/p/python-pip/.files‎

74 Bytes
Binary file not shown.

‎packages/p/python-pip/.rev‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -662,4 +662,17 @@
662662
<comment></comment>
663663
<requestid>963100</requestid>
664664
</revision>
665+
<revision rev="56" vrev="2">
666+
<srcmd5>3a849829b5bc01c3c513d45b646f8dbc</srcmd5>
667+
<version>22.0.4</version>
668+
<time>1660144348</time>
669+
<user>dimstar_suse</user>
670+
<comment>- skip subversion tests, not that relevant to pull in
671+
dozens of dependencies into small bootstrap
672+
673+
- Add distutils-reproducible-compile.patch to make installed
674+
files ordered correctly and thus builds reproducible again
675+
(port of the fix for bpo#29708 and gh#python/cpython#8057).</comment>
676+
<requestid>994298</requestid>
677+
</revision>
665678
</revisionlist>
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
---
2+
src/pip/_vendor/distlib/wheel.py | 2 +-
3+
1 file changed, 1 insertion(+), 1 deletion(-)
4+
5+
--- a/src/pip/_vendor/distlib/wheel.py
6+
+++ b/src/pip/_vendor/distlib/wheel.py
7+
@@ -538,7 +538,7 @@ class Wheel(object):
8+
maker.source_dir = workdir
9+
maker.target_dir = None
10+
try:
11+
- for zinfo in zf.infolist():
12+
+ for zinfo in sorted(zf.infolist()):
13+
arcname = zinfo.filename
14+
if isinstance(arcname, text_type):
15+
u_arcname = arcname

‎packages/p/python-pip/python-pip.changes‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,16 @@
1+
-------------------------------------------------------------------
2+
Wed Aug 10 10:33:35 UTC 2022 - Dirk Müller <dmueller@suse.com>
3+
4+
- skip subversion tests, not that relevant to pull in
5+
dozens of dependencies into small bootstrap
6+
7+
-------------------------------------------------------------------
8+
Thu Jun 23 20:08:32 UTC 2022 - Matej Cepl <mcepl@suse.com>
9+
10+
- Add distutils-reproducible-compile.patch to make installed
11+
files ordered correctly and thus builds reproducible again
12+
(port of the fix for bpo#29708 and gh#python/cpython#8057).
13+
114
-------------------------------------------------------------------
215
Sat Mar 19 17:14:58 UTC 2022 - Ben Greiner <code@bnavigator.de>
316

‎packages/p/python-pip/python-pip.spec‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ URL: http://www.pip-installer.org
5050
Source: https://github.com/pypa/pip/archive/%{version}.tar.gz#/pip-%{version}-gh.tar.gz
5151
# PATCH-FIX-OPENSUSE pip-shipped-requests-cabundle.patch -- adapted patch from python-certifi package
5252
Patch0: pip-shipped-requests-cabundle.patch
53+
# PATCH-FIX-UPSTREAM distutils-reproducible-compile.patch gh#python/cpython#8057 mcepl@suse.com
54+
# To get reproducible builds, byte_compile() of distutils.util now sorts filenames.
55+
Patch1: distutils-reproducible-compile.patch
5356
BuildRequires: %{python_module base >= 3.7}
5457
BuildRequires: %{python_module setuptools >= 40.8.0}
5558
BuildRequires: fdupes
@@ -85,8 +88,7 @@ BuildRequires: %{python_module wheel}
8588
BuildRequires: %{python_module mock}
8689
%endif
8790
BuildRequires: ca-certificates
88-
BuildRequires: git
89-
BuildRequires: subversion
91+
BuildRequires: git-core
9092
%endif
9193
%if %{with wheel}
9294
BuildRequires: %{python_module wheel}

0 commit comments

Comments
 (0)