[Python-modules-commits] [python-pip] 01/01: Update the way we clean the pip/_vendor directory to be closer to what upstream uses when it tests this feature.

[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 ca1ba83d783acfb93b345357c8b24f8e3a3be10d
Author: Barry Warsaw <barry at python.org>
Date:   Mon Dec 7 14:56:27 2015 -0500

    Update the way we clean the pip/_vendor directory to be closer to what
    upstream uses when it tests this feature.
---
 debian/rules         | 26 +++++++-------------------
 debian/tests/control |  4 ++++
 2 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/debian/rules b/debian/rules
index d41e2a7..e8227bc 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,26 +9,14 @@ export PIP_NO_VENDOR_FOR_DOWNSTREAM=1
 %:
 	dh $@ --with python2,python3 --buildsystem=pybuild
 
-# See pip/_vendor/README.rst but note that the recommendation to set
-# PIP_NO_VENDOR_FOR_DOWNSTREAM apparently doesn't work.
-#
-# https://github.com/pypa/pip/issues/3283
+# Patching DEBUNDLED=True in pip/_vendor/__init__.py is enough to disable
+# vendoring.  We remove these files (as suggested by pip/_vendor/README.rst)
+# as added insurance.  find/rm code adapted from upstream's travis run.sh.
 override_dh_auto_build:
-	rm -rf \
-		pip/_vendor/cachecontrol \
-		pip/_vendor/colorama \
-		pip/_vendor/distlib \
-		pip/_vendor/html5lib \
-		pip/_vendor/lockfile \
-		pip/_vendor/_markerlib \
-		pip/_vendor/packaging \
-		pip/_vendor/pkg_resources \
-		pip/_vendor/progress \
-		pip/_vendor/requests
-	rm -f \
-		pip/_vendor/ipaddress.py \
-		pip/_vendor/retrying.py \
-		pip/_vendor/six.py
+	find pip/_vendor -depth \
+		-not -regex 'pip/_vendor/__init__\.py$$' \
+		-not -regex 'pip/_vendor$$' \
+		-exec rm -rf {} \;
 	dh_auto_build
 
 override_dh_python3:
diff --git a/debian/tests/control b/debian/tests/control
new file mode 100644
index 0000000..70c0384
--- /dev/null
+++ b/debian/tests/control
@@ -0,0 +1,4 @@
+Test-Command: pip install flufl.lock
+
+Test-Command: pip3 install flufl.lock
+

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