rpms/python-pip
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update the patch to git version

Browse source
This commit is contained in:
Miro Hrončok 2014-06-07 18:18:53 +02:00
commit 61ab0cd65d
2 changed files with 22 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

48
pip-1.5rc1-allow-stripping-prefix-from-wheel-RECORD-files.patch → pip-1.6-allow-stripping-prefix-from-wheel-RECORD-files.patch
View file

@ -1,15 +1,14 @@
commit aefacbb76661520415a1c35028f2984e70cfe0bf
Author: Slavek Kabrda <bkabrda@redhat.com>
Date: Fri Nov 29 13:24:58 2013 +0100
Allow stripping given prefix from wheel RECORD files
diff --git a/pip/commands/install.py b/pip/commands/install.py
index 1693d01..0287c06 100644
index 20b54b9..b421d1b 100644
--- a/pip/commands/install.py
+++ b/pip/commands/install.py
@@ -137,6 +137,14 @@ class InstallCommand(Command):
help="Install everything relative to this alternate root directory.")
@@ -132,6 +132,14 @@ class InstallCommand(Command):
"directory.")
cmd_opts.add_option(
+ '--strip-file-prefix',
@ -23,24 +22,19 @@ index 1693d01..0287c06 100644
"--compile",
action="store_true",
dest="compile",
@@ -273,7 +281,11 @@ class InstallCommand(Command):
requirement_set.locate_files()
if not options.no_install and not self.bundle:
- requirement_set.install(install_options, global_options, root=options.root_path)
+ requirement_set.install(
+ install_options,
+ global_options,
+ root=options.root_path,
+ strip_file_prefix=options.strip_file_prefix)
@@ -311,6 +319,7 @@ class InstallCommand(Command):
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:
diff --git a/pip/req.py b/pip/req.py
index 3ae306d..c171130 100644
--- a/pip/req.py
+++ b/pip/req.py
@@ -615,15 +615,19 @@ exec(compile(open(__file__).read().replace('\\r\\n', '\\n'), __file__, 'exec'))
diff --git a/pip/req/req_install.py b/pip/req/req_install.py
index 6ec2a42..ac2f213 100644
--- a/pip/req/req_install.py
+++ b/pip/req/req_install.py
@@ -709,7 +709,7 @@ exec(compile(
name = name.replace(os.path.sep, '/')
return name
@ -49,7 +43,7 @@ index 3ae306d..c171130 100644
if self.editable:
self.install_editable(install_options, global_options)
return
if self.is_wheel:
@@ -717,7 +717,11 @@ exec(compile(
version = pip.wheel.wheel_version(self.source_dir)
pip.wheel.check_compatibility(version, self.name)
@ -62,9 +56,9 @@ index 3ae306d..c171130 100644
self.install_succeeded = True
return
@@ -844,13 +848,14 @@ exec(compile(open(__file__).read().replace('\\r\\n', '\\n'), __file__, 'exec'))
self._bundle_build_dirs = bundle_build_dirs
self._bundle_editable_dirs = bundle_editable_dirs
@@ -912,13 +916,14 @@ exec(compile(
def is_wheel(self):
return self.url and '.whl' in self.url
- def move_wheel_files(self, wheeldir, root=None):
+ def move_wheel_files(self, wheeldir, root=None, strip_file_prefix=None):
@ -79,10 +73,10 @@ index 3ae306d..c171130 100644
@property
diff --git a/pip/wheel.py b/pip/wheel.py
index fa3e270..3a366d0 100644
index 2d4f4df..78a99e9 100644
--- a/pip/wheel.py
+++ b/pip/wheel.py
@@ -136,7 +136,7 @@ def get_entrypoints(filename):
@@ -127,7 +127,7 @@ def get_entrypoints(filename):
def move_wheel_files(name, req, wheeldir, user=False, home=None, root=None,
@ -91,7 +85,7 @@ index fa3e270..3a366d0 100644
"""Install a wheel"""
if not scheme:
@@ -357,6 +357,8 @@ if __name__ == '__main__':
@@ -365,6 +365,8 @@ if __name__ == '__main__':
writer.writerow(row)
for f in generated:
h, l = rehash(f)

2
python-pip.spec
View file

@ -14,7 +14,7 @@ Group: Development/Libraries
License: MIT
URL: http://www.pip-installer.org
Source0: python3-nightly-pip-3eaea35f.tar
Patch0: pip-1.5rc1-allow-stripping-prefix-from-wheel-RECORD-files.patch
Patch0: pip-1.6-allow-stripping-prefix-from-wheel-RECORD-files.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch