[Python-modules-commits] [python-pip] 10/10: d/tests/pip{2, 3}-{root, user}.sh: Update the `pip list` command to explicitly name --format=columns. This avoids a test breaking deprecation warning.

[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 baabad73084f6f466452023ba51941e4aed239fa
Author: Barry Warsaw <barry at python.org>
Date:   Mon Nov 28 17:46:38 2016 -0500

    d/tests/pip{2,3}-{root,user}.sh: Update the `pip list` command to explicitly name --format=columns.  This avoids a test breaking deprecation warning.
---
 debian/changelog          | 12 ++++++++++++
 debian/control            |  4 ++++
 debian/rules              |  2 ++
 debian/tests/pip2-root.sh |  8 ++++----
 debian/tests/pip2-user.sh |  8 ++++----
 debian/tests/pip3-root.sh |  4 ++--
 debian/tests/pip3-user.sh |  4 ++--
 7 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f9372d6..0a23acd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+python-pip (9.0.1-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * d/control: Add new dependencies python3-appdirs and python3-distro to
+    Build-Depends and Built-Using.
+  * d/rules: Build appdirs and distro wheels with dirtbike.
+  * d/tests/pip{2,3}-{root,user}.sh: Update the `pip list` command to
+    explicitly name --format=columns.  This avoids a test breaking
+    deprecation warning.
+
+ -- Barry Warsaw <barry at debian.org>  Mon, 28 Nov 2016 13:47:49 -0500
+
 python-pip (8.1.2-4) unstable; urgency=medium
 
   * d/patches/disable-pip-version-check.patch: Added.  (Closes: #844679)
diff --git a/debian/control b/debian/control
index 0493093..1fb3967 100644
--- a/debian/control
+++ b/debian/control
@@ -15,10 +15,12 @@ Build-Depends: debhelper (>= 9),
                python-setuptools,
                python-webencodings,
                python3-all,
+               python3-appdirs,
                python3-cachecontrol,
                python3-chardet,
                python3-colorama,
                python3-distlib,
+               python3-distro,
                python3-html5lib,
                python3-lockfile,
                python3-mock,
@@ -81,8 +83,10 @@ Built-Using: chardet (= 2.3.0-2),
              distlib (= 0.2.4-1),
              html5lib (= 0.999999999-1),
              pyparsing (= 2.1.10+dfsg1-1),
+             appdirs (= 1.4.0-2),
              python-cachecontrol (= 0.11.7-1),
              python-colorama (= 0.3.7-1),
+             python-distro (= 1.0.1-1),
              python-ipaddress (= 1.0.17-1),
              python-lockfile (= 1:0.12.2-2),
              python-packaging (= 16.7-2),
diff --git a/debian/rules b/debian/rules
index 2950d80..246e62b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -44,10 +44,12 @@ override_dh_python2:
 override_dh_auto_install:
 	dh_auto_install
 	mkdir -p $(CURDIR)/debian/python-pip-whl/usr/share/python-wheels
+	dirtbike appdirs
 	dirtbike CacheControl
 	dirtbike chardet
 	dirtbike colorama
 	dirtbike distlib
+	dirtbike distro
 	dirtbike html5lib
 	dirtbike ipaddress
 	dirtbike lockfile
diff --git a/debian/tests/pip2-root.sh b/debian/tests/pip2-root.sh
index bc3380a..4edfaed 100644
--- a/debian/tests/pip2-root.sh
+++ b/debian/tests/pip2-root.sh
@@ -3,13 +3,13 @@
 export PIP_DISABLE_PIP_VERSION_CHECK=1
 
 pip install "world<4"
-pip list
+pip list --format=columns
 ls -ld /usr/local/lib/python2.*/dist-packages/world-*.dist-info
 pip uninstall -y world
-pip list
+pip list --format=columns
 
 pip2 install "world<4"
-pip2 list
+pip2 list --format=columns
 ls -ld /usr/local/lib/python2.*/dist-packages/world-*.dist-info
 pip2 uninstall -y world
-pip2 list
+pip2 list --format=columns
diff --git a/debian/tests/pip2-user.sh b/debian/tests/pip2-user.sh
index 22faab6..bcc0812 100644
--- a/debian/tests/pip2-user.sh
+++ b/debian/tests/pip2-user.sh
@@ -4,13 +4,13 @@ export HOME=$ADTTMP
 export PIP_DISABLE_PIP_VERSION_CHECK=1
 
 pip install "world<4"
-pip list
+pip list --format=columns
 ls -ld $HOME/.local/lib/python2.*/site-packages/world-*.dist-info
 pip uninstall -y world
-pip list
+pip list --format=columns
 
 pip2 install "world<4"
-pip2 list
+pip2 list --format=columns
 ls -ld $HOME/.local/lib/python2.*/site-packages/world-*.dist-info
 pip2 uninstall -y world
-pip2 list
+pip2 list --format=columns
diff --git a/debian/tests/pip3-root.sh b/debian/tests/pip3-root.sh
index 372c9ce..320eaf8 100644
--- a/debian/tests/pip3-root.sh
+++ b/debian/tests/pip3-root.sh
@@ -3,7 +3,7 @@
 export PIP_DISABLE_PIP_VERSION_CHECK=1
 
 pip3 install world
-pip3 list
+pip3 list --format=columns
 ls -ld /usr/local/lib/python3.*/dist-packages/world-*.dist-info
 pip3 uninstall -y world
-pip3 list
+pip3 list --format=columns
diff --git a/debian/tests/pip3-user.sh b/debian/tests/pip3-user.sh
index 64e4f7e..be3784e 100644
--- a/debian/tests/pip3-user.sh
+++ b/debian/tests/pip3-user.sh
@@ -4,7 +4,7 @@ export HOME=$ADTTMP
 export PIP_DISABLE_PIP_VERSION_CHECK=1
 
 pip3 install world
-pip3 list
+pip3 list --format=columns
 ls -ld $HOME/.local/lib/python3.*/site-packages/world-*.dist-info
 pip3 uninstall -y world
-pip3 list
+pip3 list --format=columns

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