[Python-modules-commits] [python-pip] 10/14: merge patched-dirtbike into dirtbike

[Barry Warsaw]

This is an automated email from the git hooks/post-receive script.

barry pushed a commit to branch dirtbike
in repository python-pip.

commit f6d3989a25a9187f242dcc9c5fff2cb1204c6fb3
Merge: 16e5ff2 d38a7b5
Author: Barry Warsaw <barry at python.org>
Date:   Thu Jan 28 18:01:18 2016 -0500

    merge patched-dirtbike into dirtbike

 debian/.git-dpm                                    |  4 +-
 .../patches/0005-Proper-setting-of-WHEEL_DIR.patch | 51 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 pip/_vendor/__init__.py                            | 31 ++++++++++++-
 4 files changed, 84 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index a9d1068,0000000..79f2b8b
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- a93e5cf364fe501beaaf6bfcd417fa5f0cce8431
- a93e5cf364fe501beaaf6bfcd417fa5f0cce8431
++d38a7b5dc5fb78930dfe417cf0bb0e72957444da
++d38a7b5dc5fb78930dfe417cf0bb0e72957444da
 +3be157ea672de9d85e0e888ac4080ebe66fb4782
 +3be157ea672de9d85e0e888ac4080ebe66fb4782
 +python-pip_7.1.2.orig.tar.gz
 +9eb9ea19b630412bc2b2b587fc6bbbee71950a96
 +1049170
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0005-Proper-setting-of-WHEEL_DIR.patch
index 0000000,0000000..747ede6
new file mode 100644
--- /dev/null
+++ b/debian/patches/0005-Proper-setting-of-WHEEL_DIR.patch
@@@ -1,0 -1,0 +1,51 @@@
++From d38a7b5dc5fb78930dfe417cf0bb0e72957444da Mon Sep 17 00:00:00 2001
++From: Barry Warsaw <barry at python.org>
++Date: Thu, 28 Jan 2016 18:00:56 -0500
++Subject: Proper setting of WHEEL_DIR.
++
++---
++ pip/_vendor/__init__.py | 31 ++++++++++++++++++++++++++++++-
++ 1 file changed, 30 insertions(+), 1 deletion(-)
++
++diff --git a/pip/_vendor/__init__.py b/pip/_vendor/__init__.py
++index 9e124b9..e7a9c43 100644
++--- a/pip/_vendor/__init__.py
+++++ b/pip/_vendor/__init__.py
++@@ -20,7 +20,36 @@ DEBUNDLED = True
++ # add to the beginning of sys.path before attempting to import anything. This
++ # is done to support downstream re-distributors like Debian and Fedora who
++ # wish to create their own Wheels for our dependencies to aid in debundling.
++-WHEEL_DIR = os.path.abspath(os.path.dirname(__file__))
+++base_prefix = getattr(sys, 'base_prefix', None)
+++real_prefix = getattr(sys, 'real_prefix', None)
+++if base_prefix is None:
+++    # Python 2 has no base_prefix at all.  It also has no pyvenv.  Fall back
+++    # to checking real_prefix.
+++    if real_prefix is None:
+++        # We are not in a venv.
+++        in_venv = False
+++    else:
+++        # We're in a Python 2 virtualenv created venv, but real_prefix should
+++        # never be the same as sys.prefix.
+++        assert sys.prefix != real_prefix
+++        in_venv = True
+++elif sys.prefix != base_prefix:
+++    # We're in a Python 3, pyvenv created venv.
+++    in_venv = True
+++elif real_prefix is None:
+++    # We're in Python 3, outside a venv, but base better equal prefix.
+++    assert sys.prefix == base_prefix
+++    in_venv = False
+++else:
+++    # We're in a Python 3, virtualenv created venv.
+++    assert real_prefix != sys.prefix
+++    in_venv = True
+++
+++
+++if in_venv:
+++    WHEEL_DIR = os.path.join(sys.prefix, 'lib', 'python-wheels')
+++else:
+++    WHEEL_DIR = '/usr/share/python-wheels'
++ 
++ 
++ # Define a small helper function to alias our vendored modules to the real ones
diff --cc debian/patches/series
index c0c58d3,0000000..877ad2d
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,0 +1,5 @@@
 +use-wheels.patch
 +hands-off-system-packages.patch
 +enable-debundling.patch
 +disable-console-scripts.patch
++0005-Proper-setting-of-WHEEL_DIR.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-pip.git