[Python-modules-commits] [python-pip] 02/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 31ca8480c13c229864f372ee227935cc773b1a3b
Merge: 4c4859d 3745fa3
Author: Barry Warsaw <barry at python.org>
Date:   Thu Jun 16 15:31:04 2016 +0300

    merge patched into master

 debian/.git-dpm                                    |  4 +-
 ...ription-Warn-and-skip-broken-requirements.patch | 47 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 pip/operations/freeze.py                           | 16 ++++++--
 4 files changed, 62 insertions(+), 6 deletions(-)

diff --cc debian/.git-dpm
index 9e5b743,0000000..f9c42a0
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
- 289237da3f9ec6410a1976b4eaefd24bb8e05baa
- 289237da3f9ec6410a1976b4eaefd24bb8e05baa
++3745fa3b55453edade3f3f60b6bec361c079857d
++3745fa3b55453edade3f3f60b6bec361c079857d
 +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/0005-Description-Warn-and-skip-broken-requirements.patch
index 0000000,0000000..37c184f
new file mode 100644
--- /dev/null
+++ b/debian/patches/0005-Description-Warn-and-skip-broken-requirements.patch
@@@ -1,0 -1,0 +1,47 @@@
++From 3745fa3b55453edade3f3f60b6bec361c079857d Mon Sep 17 00:00:00 2001
++From: Barry Warsaw <barry at python.org>
++Date: Thu, 16 Jun 2016 15:29:12 +0300
++Subject: =?UTF-8?q?Description:=20Warn=20and=20skip=20broken=20requirement?=
++ =?UTF-8?q?s.=0AOrigin:=20https://github.com/pypa/pip/pull/3704=0ABug:=20h?=
++ =?UTF-8?q?ttps://github.com/pypa/pip/issues/3681=0AForwarded:=20not-neede?=
++ =?UTF-8?q?d?=
++
++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:
diff --cc debian/patches/series
index 4a3d677,0000000..5dd4e8f
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,0 +1,5 @@@
 +hands-off-system-packages.patch
 +debundle.patch
 +handle-unbundled-requests.patch
 +set_user_default.patch
++0005-Description-Warn-and-skip-broken-requirements.patch

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