[Python-modules-commits] [python-pip] 04/04: d/patches/set_user_default.patch: Port from Ubuntu.

[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 468168814639fff4bbde952526394589ff21c633
Author: Barry Warsaw <barry at python.org>
Date:   Wed Feb 10 16:03:00 2016 -0500

    d/patches/set_user_default.patch: Port from Ubuntu.
    
    * d/patches/set_user_default.patch: Port from Ubuntu.  When run as a
      non-root user outside of a virtual environment --user is the default,
      and --ignore-installed is implied.  (Closes: #725848)
    * d/tests:
      - Rename pip2.sh -> pip2-root.sh
      - Rename pip3.sh -> pip3-root.sh
      - Add pip2-user.sh to test default non-root --user behavior for Python 2.
      - Add pip3-user.sh to test default non-root --user behavior for Python 3.
---
 debian/changelog          | 8 ++++++++
 debian/tests/control      | 8 ++++++--
 debian/tests/pip2-root.sh | 7 +++++++
 debian/tests/pip2-user.sh | 9 +++++++++
 debian/tests/pip2.sh      | 6 ------
 debian/tests/pip3-root.sh | 7 +++++++
 debian/tests/pip3-user.sh | 9 +++++++++
 debian/tests/pip3.sh      | 6 ------
 8 files changed, 46 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a4b77a7..c179935 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,14 @@
 python-pip (8.0.2-4) UNRELEASED; urgency=medium
 
   * Restore Built-Using header to python-pip-whl.
+  * d/patches/set_user_default.patch: Port from Ubuntu.  When run as a
+    non-root user outside of a virtual environment --user is the default,
+    and --ignore-installed is implied.  (Closes: #725848)
+  * d/tests:
+    - Rename pip2.sh -> pip2-root.sh
+    - Rename pip3.sh -> pip3-root.sh
+    - Add pip2-user.sh to test default non-root --user behavior for Python 2.
+    - Add pip3-user.sh to test default non-root --user behavior for Python 3.
 
  -- Barry Warsaw <barry at debian.org>  Mon, 08 Feb 2016 10:08:53 -0500
 
diff --git a/debian/tests/control b/debian/tests/control
index e40299e..e5c8e04 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,5 +1,9 @@
-Tests: pip2.sh
+Tests: pip2-root.sh
 Restrictions: needs-root
 
-Tests: pip3.sh
+Tests: pip3-root.sh
 Restrictions: needs-root
+
+Tests: pip2-user.sh
+
+Tests: pip3-user.sh
diff --git a/debian/tests/pip2-root.sh b/debian/tests/pip2-root.sh
new file mode 100644
index 0000000..26d5b88
--- /dev/null
+++ b/debian/tests/pip2-root.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+pip install world
+pip list
+ls -ld /usr/local/lib/python2.*/dist-packages/world-*.dist-info
+pip uninstall -y world
+pip list
diff --git a/debian/tests/pip2-user.sh b/debian/tests/pip2-user.sh
new file mode 100644
index 0000000..4fb05b4
--- /dev/null
+++ b/debian/tests/pip2-user.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+export HOME=$ADTTMP
+
+pip install world
+pip list
+ls -ld $HOME/.local/lib/python2.*/site-packages/world-*.dist-info
+pip uninstall -y world
+pip list
diff --git a/debian/tests/pip2.sh b/debian/tests/pip2.sh
deleted file mode 100644
index 6d4ef12..0000000
--- a/debian/tests/pip2.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-pip install six
-pip list
-pip uninstall -y six
-pip list
diff --git a/debian/tests/pip3-root.sh b/debian/tests/pip3-root.sh
new file mode 100644
index 0000000..a662185
--- /dev/null
+++ b/debian/tests/pip3-root.sh
@@ -0,0 +1,7 @@
+#!/bin/sh
+
+pip3 install world
+pip3 list
+ls -ld /usr/local/lib/python3.*/dist-packages/world-*.dist-info
+pip3 uninstall -y world
+pip3 list
diff --git a/debian/tests/pip3-user.sh b/debian/tests/pip3-user.sh
new file mode 100644
index 0000000..4e73e4d
--- /dev/null
+++ b/debian/tests/pip3-user.sh
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+export HOME=$ADTTMP
+
+pip3 install world
+pip3 list
+ls -ld $HOME/.local/lib/python3.*/site-packages/world-*.dist-info
+pip3 uninstall -y world
+pip3 list
diff --git a/debian/tests/pip3.sh b/debian/tests/pip3.sh
deleted file mode 100644
index 58af5c8..0000000
--- a/debian/tests/pip3.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-pip3 install six
-pip3 list
-pip3 uninstall -y six
-pip3 list

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