[Python-modules-commits] [python-pip] 03/03: d/rules: Also generate /usr/bin/pip2. (Closes: #834193)

[Barry Warsaw]

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

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

commit 930bcbb4fe65674392e118c4045444aec78ae3fb
Author: Barry Warsaw <barry at python.org>
Date:   Mon Oct 31 18:32:03 2016 -0400

    d/rules: Also generate /usr/bin/pip2.  (Closes: #834193)
---
 debian/changelog          | 5 ++++-
 debian/rules              | 2 ++
 debian/tests/pip2-root.sh | 6 ++++++
 debian/tests/pip2-user.sh | 6 ++++++
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 8830b6a..8c30fc7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,11 @@ python-pip (8.1.2-3) UNRELEASED; urgency=medium
   [ Felipe Reyes ]
   * d/tests:
     - control: Add needs-recommends restriction. (Closes: #842732)
-    - pip2-*.sh: Install world<4 since v4 is not Python 2 compatible.
+    - pip2-*.sh:
+      + Install world<4 since v4 is not Python 2 compatible.
+      + Add tests which invoke pip2.
   * d/control: Update Built-Using.
+  * d/rules: Also generate /usr/bin/pip2.  (Closes: #834193)
 
  -- Barry Warsaw <barry at debian.org>  Mon, 31 Oct 2016 15:26:49 -0400
 
diff --git a/debian/rules b/debian/rules
index abc8d49..3270f46 100755
--- a/debian/rules
+++ b/debian/rules
@@ -38,6 +38,8 @@ override_dh_python2:
 	rm -f debian/python-pip/usr/bin/pip2.?
 	python3 debian/makepip.py /usr/bin/python \
 		debian/python-pip/usr/bin/pip
+	python3 debian/makepip.py /usr/bin/python2 \
+		debian/python-pip/usr/bin/pip2
 
 override_dh_auto_install:
 	dh_auto_install
diff --git a/debian/tests/pip2-root.sh b/debian/tests/pip2-root.sh
index 0b2ba1b..bc3380a 100644
--- a/debian/tests/pip2-root.sh
+++ b/debian/tests/pip2-root.sh
@@ -7,3 +7,9 @@ pip list
 ls -ld /usr/local/lib/python2.*/dist-packages/world-*.dist-info
 pip uninstall -y world
 pip list
+
+pip2 install "world<4"
+pip2 list
+ls -ld /usr/local/lib/python2.*/dist-packages/world-*.dist-info
+pip2 uninstall -y world
+pip2 list
diff --git a/debian/tests/pip2-user.sh b/debian/tests/pip2-user.sh
index ea96d0b..22faab6 100644
--- a/debian/tests/pip2-user.sh
+++ b/debian/tests/pip2-user.sh
@@ -8,3 +8,9 @@ pip list
 ls -ld $HOME/.local/lib/python2.*/site-packages/world-*.dist-info
 pip uninstall -y world
 pip list
+
+pip2 install "world<4"
+pip2 list
+ls -ld $HOME/.local/lib/python2.*/site-packages/world-*.dist-info
+pip2 uninstall -y world
+pip2 list

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