[Python-modules-commits] [python-pip] 08/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 206ab7dcdffd56f8fd6a59415e2522341b21bbc9
Merge: d6f1708 bf02621
Author: Barry Warsaw <barry at python.org>
Date:   Fri Jun 17 09:52:33 2016 +0300

    merge patched into master

 debian/.git-dpm                            |  4 ++--
 debian/patches/skip-bad-requirements.patch | 24 ++----------------------
 pip/__main__.py                            |  9 ---------
 3 files changed, 4 insertions(+), 33 deletions(-)

diff --cc debian/.git-dpm
index 4264eb4,0000000..e93345f
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
- 0ebc20dd1c0e5f2c7c1f28b0859a63f8b024365c
- 0ebc20dd1c0e5f2c7c1f28b0859a63f8b024365c
++bf0262170b9b02149d5e8d3266bd1e86b03b5650
++bf0262170b9b02149d5e8d3266bd1e86b03b5650
 +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/skip-bad-requirements.patch
index 4b3a4b0,0000000..6e10f6e
mode 100644,000000..100644
--- a/debian/patches/skip-bad-requirements.patch
+++ b/debian/patches/skip-bad-requirements.patch
@@@ -1,69 -1,0 +1,49 @@@
- From 0ebc20dd1c0e5f2c7c1f28b0859a63f8b024365c Mon Sep 17 00:00:00 2001
++From bf0262170b9b02149d5e8d3266bd1e86b03b5650 Mon Sep 17 00:00:00 2001
 +From: Barry Warsaw <barry at python.org>
 +Date: Thu, 16 Jun 2016 15:29:12 +0300
 +Subject: Warn and skip broken requirements.
 +
 +Description: Warn and skip broken requirements.
 +Origin: https://github.com/pypa/pip/pull/3704
 +Bug: https://github.com/pypa/pip/issues/3681
 +Forwarded: not-needed
 +
 +Patch-Name: skip-bad-requirements.patch
 +---
-  pip/__main__.py          |  9 +++++++++
 + pip/operations/freeze.py | 16 ++++++++++++----
-  2 files changed, 21 insertions(+), 4 deletions(-)
++ 1 file changed, 12 insertions(+), 4 deletions(-)
 +
- 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 --git a/pip/operations/freeze.py b/pip/operations/freeze.py
 +index 086922e..7493ced 100644
 +--- a/pip/operations/freeze.py
 ++++ b/pip/operations/freeze.py
 +@@ -8,6 +8,7 @@ from pip.req import InstallRequirement
 + from pip.utils import get_installed_distributions
 + from pip._vendor import pkg_resources
 + from pip._vendor.packaging.utils import canonicalize_name
 ++from pip._vendor.pkg_resources import RequirementParseError
 + 
 + 
 + logger = logging.getLogger(__name__)
 +@@ -42,10 +43,17 @@ def freeze(
 +     for dist in get_installed_distributions(local_only=local_only,
 +                                             skip=(),
 +                                             user_only=user_only):
 +-        req = pip.FrozenRequirement.from_dist(
 +-            dist,
 +-            dependency_links
 +-        )
 ++        try:
 ++            req = pip.FrozenRequirement.from_dist(
 ++                dist,
 ++                dependency_links
 ++            )
 ++        except RequirementParseError:
 ++            logger.warning(
 ++                "Could not parse requirement: %s",
 ++                dist.project_name
 ++            )
 ++            continue
 +         installations[req.name] = req
 + 
 +     if requirement:

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