[Python-modules-commits] [python-pip] 02/17: merge patched into master

[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 e6a21fbc9ef514d138a4fdf4d0297968961e13d8
Merge: 9eedeb8 2a0ccff
Author: Barry Warsaw <barry at python.org>
Date:   Fri Jun 17 09:36:27 2016 +0300

    merge patched into master

 debian/.git-dpm                            |  4 ++--
 debian/patches/ignore-socks-warnings.patch | 29 +++++++++++++++++++++++++++++
 debian/patches/series                      |  1 +
 pip/__main__.py                            |  9 +++++++++
 4 files changed, 41 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index 99b14fe,0000000..0958655
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- a20c5a09204cc0f44a857d8913610e23ed41449a
- a20c5a09204cc0f44a857d8913610e23ed41449a
++2a0ccff7ac7e9c40ad9cd3c529674d109faf0e6a
++2a0ccff7ac7e9c40ad9cd3c529674d109faf0e6a
 +030df74bb06ecef9a308cb8315a0c93f1f971cfb
 +030df74bb06ecef9a308cb8315a0c93f1f971cfb
 +python-pip_8.1.2.orig.tar.gz
 +1c13c247967ec5bee6de5fd104c5d78ba30951c7
 +1140573
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/ignore-socks-warnings.patch
index 0000000,0000000..3b7dc70
new file mode 100644
--- /dev/null
+++ b/debian/patches/ignore-socks-warnings.patch
@@@ -1,0 -1,0 +1,29 @@@
++From 2a0ccff7ac7e9c40ad9cd3c529674d109faf0e6a Mon Sep 17 00:00:00 2001
++From: Barry Warsaw <barry at python.org>
++Date: Fri, 17 Jun 2016 09:35:24 +0300
++Subject: Ignore urllib3 DependencyWarnings on socks.
++
++Patch-Name: ignore-socks-warnings.patch
++---
++ pip/__main__.py | 9 +++++++++
++ 1 file changed, 9 insertions(+)
++
++diff --git a/pip/__main__.py b/pip/__main__.py
++index 5556539..7e30310 100644
++--- a/pip/__main__.py
+++++ b/pip/__main__.py
++@@ -15,5 +15,14 @@ if __package__ == '':
++ 
++ import pip  # noqa
++ 
+++# 2016-06-17 barry at debian.org: urllib3 recently added optional socks support,
+++# but it issues a homegrown DependencyWarning if socks can't be imported.  For
+++# now I don't want to add socks as a dependency for pip, but allowing the
+++# warning to be printed to stderr breaks the DEP-8 tests and is just plain
+++# annoying for normal users.  For now, suppress the warning.
+++from urllib3.exceptions import DependencyWarning
+++import warnings
+++warnings.simplefilter('ignore', category=DependencyWarning)
+++
++ if __name__ == '__main__':
++     sys.exit(pip.main())
diff --cc debian/patches/series
index 208e71a,0000000..89c28e1
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,5 -1,0 +1,6 @@@
 +hands-off-system-packages.patch
 +debundle.patch
 +handle-unbundled-requests.patch
 +set_user_default.patch
 +skip-bad-requirements.patch
++ignore-socks-warnings.patch

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