[Python-modules-commits] [python-pip] 10/11: 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 340883e667b948d90c9118432b77b13a7e1b37e0
Merge: c41ed60 a20c5a0
Author: Barry Warsaw <barry at python.org>
Date:   Thu Jun 16 15:35:12 2016 +0300

    merge patched into master

 debian/.git-dpm                                                       | 4 ++--
 debian/patches/series                                                 | 2 +-
 ...and-skip-broken-requirements.patch => skip-bad-requirements.patch} | 3 ++-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index 1f03964,0000000..99b14fe
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
- 736faf67cd1bc29a23481ec483b63eee5459c5aa
- 736faf67cd1bc29a23481ec483b63eee5459c5aa
++a20c5a09204cc0f44a857d8913610e23ed41449a
++a20c5a09204cc0f44a857d8913610e23ed41449a
 +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/series
index 58e963b,0000000..208e71a
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,5 -1,0 +1,5 @@@
 +hands-off-system-packages.patch
 +debundle.patch
 +handle-unbundled-requests.patch
 +set_user_default.patch
- 0005-Warn-and-skip-broken-requirements.patch
++skip-bad-requirements.patch
diff --cc debian/patches/skip-bad-requirements.patch
index 58aa63b,0000000..7f3614d
mode 100644,000000..100644
--- a/debian/patches/skip-bad-requirements.patch
+++ b/debian/patches/skip-bad-requirements.patch
@@@ -1,48 -1,0 +1,49 @@@
- From 736faf67cd1bc29a23481ec483b63eee5459c5aa Mon Sep 17 00:00:00 2001
++From a20c5a09204cc0f44a857d8913610e23ed41449a 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/operations/freeze.py | 16 ++++++++++++----
 + 1 file changed, 12 insertions(+), 4 deletions(-)
 +
 +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