[Python-modules-commits] [python-pip] 01/03: Fix original bug LP: #1626258

[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 8142a87860bd0dea93edf331af6674b423772959
Author: Barry Warsaw <barry at python.org>
Date:   Mon Oct 31 15:46:17 2016 -0400

    Fix original bug LP: #1626258
    
    * d/tests:
      - control: Add needs-recommends restriction. (Closes: #842732)
      - pip2-*.sh: Install world<4 since v4 is not Python 2 compatible.
---
 debian/changelog          | 14 ++++++++++++--
 debian/control            | 28 ++++++++++++++--------------
 debian/tests/control      |  7 +++++--
 debian/tests/pip2-root.sh |  2 +-
 debian/tests/pip2-user.sh |  2 +-
 5 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3194dd8..8830b6a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,17 @@
+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.
+  * d/control: Update Built-Using.
+
+ -- Barry Warsaw <barry at debian.org>  Mon, 31 Oct 2016 15:26:49 -0400
+
 python-pip (8.1.2-2) unstable; urgency=medium
 
-  * d/control: 
-    - Update descriptions since pip really isn't the "alternative" any more 
+  * d/control:
+    - Update descriptions since pip really isn't the "alternative" any more
       and nobody still uses easy_install.
     - Update Built-Using packages and versions.
   * d/tests/*.sh: export PIP_DISABLE_PIP_VERSION_CHECK=1 to prevent
diff --git a/debian/control b/debian/control
index 19bd9e8..01e96dd 100644
--- a/debian/control
+++ b/debian/control
@@ -75,20 +75,20 @@ Package: python-pip-whl
 Architecture: all
 Depends: ca-certificates, ${misc:Depends}
 Built-Using: chardet (= 2.3.0-2),
-	     distlib (= 0.2.3-1),
-	     html5lib (= 0.999-4),
- 	     pyparsing (= 2.1.4+dfsg1-1),
- 	     python-cachecontrol (= 0.11.5-1.1),
- 	     python-colorama (= 0.3.7-1),
- 	     python-ipaddress (= 1.0.16-1),
- 	     python-lockfile (= 1:0.12.2-1),
- 	     python-packaging (= 16.7-2),
- 	     python-progress (= 1.2-1),
- 	     python-retrying (= 1.3.3-1),
- 	     python-setuptools (= 20.10.1-1),
- 	     python-urllib3 (= 1.15.1-2),
- 	     requests (= 2.10.0-1),
- 	     six (= 1.10.0-3),
+             distlib (= 0.2.4-1),
+             html5lib (= 0.999-4),
+             pyparsing (= 2.1.10+dfsg1-1),
+             python-cachecontrol (= 0.11.7-1),
+             python-colorama (= 0.3.7-1),
+             python-ipaddress (= 1.0.17-1),
+             python-lockfile (= 1:0.12.2-2),
+             python-packaging (= 16.7-2),
+             python-progress (= 1.2-1),
+             python-retrying (= 1.3.3-1),
+             python-setuptools (= 28.0.0-1),
+             python-urllib3 (= 1.16-1),
+             requests (= 2.11.1-1),
+             six (= 1.10.0-3),
 Breaks: python-chardet-whl (<< 2.3.0-2),
         python-colorama-whl (<< 0.3.6-1),
         python-distlib-whl (<< 0.2.2-1),
diff --git a/debian/tests/control b/debian/tests/control
index 4125451..3fdd203 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,12 +1,15 @@
 Tests: pip2-root.sh
-Restrictions: needs-root
+Restrictions: needs-root,needs-recommends
 
 Tests: pip3-root.sh
-Restrictions: needs-root
+Restrictions: needs-root,needs-recommends
 
 Tests: pip2-user.sh
+Restrictions: needs-recommends
 
 Tests: pip3-user.sh
+Restrictions: needs-recommends
 
 # https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=823358
 Tests: pip3-editable.sh
+Restrictions: needs-recommends
diff --git a/debian/tests/pip2-root.sh b/debian/tests/pip2-root.sh
index c2a1bdb..0b2ba1b 100644
--- a/debian/tests/pip2-root.sh
+++ b/debian/tests/pip2-root.sh
@@ -2,7 +2,7 @@
 
 export PIP_DISABLE_PIP_VERSION_CHECK=1
 
-pip install world
+pip install "world<4"
 pip list
 ls -ld /usr/local/lib/python2.*/dist-packages/world-*.dist-info
 pip uninstall -y world
diff --git a/debian/tests/pip2-user.sh b/debian/tests/pip2-user.sh
index 1be8421..ea96d0b 100644
--- a/debian/tests/pip2-user.sh
+++ b/debian/tests/pip2-user.sh
@@ -3,7 +3,7 @@
 export HOME=$ADTTMP
 export PIP_DISABLE_PIP_VERSION_CHECK=1
 
-pip install world
+pip install "world<4"
 pip list
 ls -ld $HOME/.local/lib/python2.*/site-packages/world-*.dist-info
 pip uninstall -y world

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