[Python-modules-commits] [python-pip] 08/14: Add a few more dependencies.

[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 16e5ff2b0a0d7f2fe2c0daac1b4cbe7f0f2b486c
Author: Barry Warsaw <barry at python.org>
Date:   Thu Jan 28 17:26:28 2016 -0500

    Add a few more dependencies.
    
    * python{,3}-progress is currently in NEW though.
    * I'm still not sure whether we need the Built-Using field.
    * Move dirtbike calls to the override_dh_auto_install
    * Make sure a directory exists.
---
 debian/changelog              |  1 +
 debian/control                |  3 +++
 debian/python-pip-whl.install |  1 -
 debian/rules                  | 36 +++++++++++++++++++-----------------
 4 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a6c7677..c886349 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ python-pip (7.1.2-1) UNRELEASED; urgency=medium
     - File ITP and upload 15.2 into Debian
     - Update Debian Python policy to name the new dependencies, all of
       which must be installed as -whl.  -- or rewheel
+    - Built-Using
   * New upstream release.
   * d/control:
     - Update python-pip-whl binary package's Depends since we will be
diff --git a/debian/control b/debian/control
index 8a62d41..7e31c4e 100644
--- a/debian/control
+++ b/debian/control
@@ -11,9 +11,11 @@ Build-Depends: debhelper (>= 8),
                dirtbike,
                python-all (>= 2.6),
                python-docutils,
+               python-ipaddress,
                python-lockfile,
                python-mock,
                python-packaging,
+               python-progress,
                python-pytest,
                python-retrying,
                python-scripttest,
@@ -29,6 +31,7 @@ Build-Depends: debhelper (>= 8),
                python3-mock,
                python3-packaging,
                python3-pkg-resources,
+               python3-progress,
                python3-pytest,
                python3-requests,
                python3-retrying,
diff --git a/debian/python-pip-whl.install b/debian/python-pip-whl.install
deleted file mode 100644
index ad074a0..0000000
--- a/debian/python-pip-whl.install
+++ /dev/null
@@ -1 +0,0 @@
-dist/*.whl usr/share/python-wheels
diff --git a/debian/rules b/debian/rules
index 5846c46..a07f0a1 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,8 @@ export PYBUILD_VERBOSE=1
 export DH_VERBOSE=1
 
 export PIP_NO_VENDOR_FOR_DOWNSTREAM=1
+export DIRTBIKE_DIRECTORY=\
+    $(CURDIR)/debian/python-pip-whl/usr/share/python-wheels
 
 
 %:
@@ -19,19 +21,6 @@ override_dh_auto_build:
 		-not -regex 'pip/_vendor$$' \
 		-exec rm -rf {} \;
 	dh_auto_build
-	dirtbike cachecontrol
-	dirtbike chardet
-	dirtbike colorama
-	dirtbike distlib
-	dirtbike html5lib
-	dirtbike lockfile
-	dirtbike packaging
-	dirtbike pkg_resources
-	dirtbike requests
-	dirtbike retrying
-	dirtbike setuptools
-	dirtbike six
-	dirtbike urllib3
 
 # Upstream does not bundle enough of the source tree in the tarball to run the
 # test suite.  https://github.com/pypa/pip/issues/3370
@@ -51,15 +40,28 @@ override_dh_python2:
 
 override_dh_auto_install:
 	dh_auto_install
-	mkdir -p $(CURDIR)/debian/tmp/usr/share/python-wheels
-	python3 setup.py bdist_wheel \
-		--universal \
-		-d $(CURDIR)/debian/tmp/usr/share/python-wheels
+	mkdir -p $(CURDIR)/debian/python-pip-whl/usr/share/python-wheels
+	dirtbike CacheControl
+	dirtbike chardet
+	dirtbike colorama
+	dirtbike distlib
+	dirtbike html5lib
+	dirtbike ipaddress
+	dirtbike lockfile
+	dirtbike packaging
+	dirtbike pkg_resources
+	dirtbike progress
+	dirtbike requests
+	dirtbike retrying
+	dirtbike setuptools
+	dirtbike six
+	dirtbike urllib3
 
 override_dh_installchangelogs:
 	dh_installchangelogs CHANGES.txt
 
 override_dh_installman:
+	mkdir -p debian/tmp
 	rst2man debian/pip-manpage.rst > debian/tmp/pip.man
 	rst2man debian/pip-manpage.rst > debian/tmp/pip3.man
 	dh_installman

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