[Python-modules-commits] [python-pip] 13/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 151d2ce7650c57ca8a220405b23b2e53f681b09b
Merge: 9bd89a2 29820a4
Author: Barry Warsaw <barry at python.org>
Date:   Thu Jan 28 18:04:51 2016 -0500

    merge patched-dirtbike into dirtbike

 debian/.git-dpm                                 |  4 +--
 debian/patches/0006-Keep-the-entry-points.patch | 36 +++++++++++++++++++++++++
 debian/patches/series                           |  1 +
 setup.py                                        | 16 +++++------
 4 files changed, 46 insertions(+), 11 deletions(-)

diff --cc debian/.git-dpm
index 79f2b8b,0000000..17dec05
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
- d38a7b5dc5fb78930dfe417cf0bb0e72957444da
- d38a7b5dc5fb78930dfe417cf0bb0e72957444da
++29820a4b468990ef69b2a85b2dfd287a6c8dc045
++29820a4b468990ef69b2a85b2dfd287a6c8dc045
 +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/0006-Keep-the-entry-points.patch
index 0000000,0000000..7b24c4f
new file mode 100644
--- /dev/null
+++ b/debian/patches/0006-Keep-the-entry-points.patch
@@@ -1,0 -1,0 +1,36 @@@
++From 29820a4b468990ef69b2a85b2dfd287a6c8dc045 Mon Sep 17 00:00:00 2001
++From: Barry Warsaw <barry at python.org>
++Date: Thu, 28 Jan 2016 18:04:42 -0500
++Subject: Keep the entry points.
++
++---
++ setup.py | 16 +++++++---------
++ 1 file changed, 7 insertions(+), 9 deletions(-)
++
++diff --git a/setup.py b/setup.py
++index cb0eab6..60843e5 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -81,15 +81,13 @@ setup(
++         "pip._vendor.distlib._backport": ["sysconfig.cfg"],
++         "pip._vendor.distlib": ["t32.exe", "t64.exe", "w32.exe", "w64.exe"],
++     },
++-    # In Debian, we'll generate our own console scripts to properly handle
++-    # installing wheels early enough on sys.path.
++-    ## entry_points={
++-    ##     "console_scripts": [
++-    ##         "pip=pip:main",
++-    ##         "pip%s=pip:main" % sys.version[:1],
++-    ##         "pip%s=pip:main" % sys.version[:3],
++-    ##     ],
++-    ## },
+++    entry_points={
+++        "console_scripts": [
+++            "pip=pip:main",
+++            "pip%s=pip:main" % sys.version[:1],
+++            "pip%s=pip:main" % sys.version[:3],
+++        ],
+++    },
++     tests_require=tests_require,
++     zip_safe=False,
++     extras_require={
diff --cc debian/patches/series
index 877ad2d,0000000..f19b7e4
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,5 -1,0 +1,6 @@@
 +use-wheels.patch
 +hands-off-system-packages.patch
 +enable-debundling.patch
 +disable-console-scripts.patch
 +0005-Proper-setting-of-WHEEL_DIR.patch
++0006-Keep-the-entry-points.patch

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