[Python-modules-commits] [python-pip] 02/03: 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 2be19e37fd165c9ae8f67e97af81d758773d1d93
Merge: ef22de9 278b3fa
Author: Barry Warsaw <barry at python.org>
Date:   Fri Nov 18 17:08:26 2016 -0500

    merge patched into master

 debian/.git-dpm                                |  4 ++--
 debian/patches/disable-pip-version-check.patch | 23 +++++++++++++++++++++++
 debian/patches/ignore-socks-warnings.patch     |  2 --
 debian/patches/series                          |  1 +
 pip/cmdoptions.py                              |  2 +-
 5 files changed, 27 insertions(+), 5 deletions(-)

diff --cc debian/.git-dpm
index 04f5de8,0000000..c1a1d62
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
- de20a722f0a3aab9ece68376cc905fbd5f9b5055
- de20a722f0a3aab9ece68376cc905fbd5f9b5055
++278b3faec873b18333dba315ddbe97754d71c858
++278b3faec873b18333dba315ddbe97754d71c858
 +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/disable-pip-version-check.patch
index 0000000,0000000..8064002
new file mode 100644
--- /dev/null
+++ b/debian/patches/disable-pip-version-check.patch
@@@ -1,0 -1,0 +1,23 @@@
++From 278b3faec873b18333dba315ddbe97754d71c858 Mon Sep 17 00:00:00 2001
++From: Barry Warsaw <barry at python.org>
++Date: Fri, 18 Nov 2016 17:07:47 -0500
++Subject: Set --disable-pip-version-check=True by default.
++
++Patch-Name: disable-pip-version-check.patch
++---
++ pip/cmdoptions.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/pip/cmdoptions.py b/pip/cmdoptions.py
++index 1fade87..4ddb39b 100644
++--- a/pip/cmdoptions.py
+++++ b/pip/cmdoptions.py
++@@ -510,7 +510,7 @@ disable_pip_version_check = partial(
++     "--disable-pip-version-check",
++     dest="disable_pip_version_check",
++     action="store_true",
++-    default=False,
+++    default=True,
++     help="Don't periodically check PyPI to determine whether a new version "
++          "of pip is available for download. Implied with --no-index.")
++ 
diff --cc debian/patches/ignore-socks-warnings.patch
index f8fa68c,0000000..7c11bc2
mode 100644,000000..100644
--- a/debian/patches/ignore-socks-warnings.patch
+++ b/debian/patches/ignore-socks-warnings.patch
@@@ -1,35 -1,0 +1,33 @@@
 +From de20a722f0a3aab9ece68376cc905fbd5f9b5055 Mon Sep 17 00:00:00 2001
 +From: Barry Warsaw <barry at python.org>
 +Date: Fri, 17 Jun 2016 10:11:10 +0300
 +Subject: Suppress urllib3 socks dependency warnings.
 +
- Bug: https://github.com/pypa/pip/issues/3802
- 
 +Patch-Name: ignore-socks-warnings.patch
 +---
 + pip/__init__.py | 12 ++++++++++++
 + 1 file changed, 12 insertions(+)
 +
 +diff --git a/pip/__init__.py b/pip/__init__.py
 +index 588c881..16e9fdd 100755
 +--- a/pip/__init__.py
 ++++ b/pip/__init__.py
 +@@ -10,6 +10,18 @@ import warnings
 + import sys
 + import re
 + 
 ++# 2016-06-17 barry at debian.org: urllib3 1.14 added optional support for socks,
 ++# but if invoked (i.e. imported), it will issue a warning to stderr if socks
 ++# isn't available.  requests unconditionally imports urllib3's socks contrib
 ++# module, triggering this warning.  The warning breaks DEP-8 tests (because of
 ++# the stderr output) and is just plain annoying in normal usage.  I don't want
 ++# to add socks as yet another dependency for pip, nor do I want to allow-stder
 ++# in the DEP-8 tests, so just suppress the warning.  pdb tells me this has to
 ++# be done before the import of pip.vcs.
 ++from pip._vendor.requests.packages.urllib3.exceptions import DependencyWarning
 ++warnings.filterwarnings('ignore', category=DependencyWarning)
 ++
 ++
 + from pip.exceptions import InstallationError, CommandError, PipError
 + from pip.utils import get_installed_distributions, get_prog
 + from pip.utils import deprecation, dist_is_editable
diff --cc debian/patches/series
index 89c28e1,0000000..0e92140
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,6 -1,0 +1,7 @@@
 +hands-off-system-packages.patch
 +debundle.patch
 +handle-unbundled-requests.patch
 +set_user_default.patch
 +skip-bad-requirements.patch
 +ignore-socks-warnings.patch
++disable-pip-version-check.patch

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