[Python-modules-commits] [python-pip] 02/03: merge patched-release-1.5.6 into release-1.5.6

[Barry Warsaw]

This is an automated email from the git hooks/post-receive script.

barry pushed a commit to branch release-1.5.6
in repository python-pip.

commit 9557a04e646601048a16cb88e9fffe90dc648e21
Merge: a3420fc 6cddeda
Author: Barry Warsaw <barry at debian.org>
Date:   Tue Aug 18 11:18:14 2015 -0400

    merge patched-release-1.5.6 into release-1.5.6

 debian/.git-dpm                                    |  4 +--
 .../pep-440-arbitrary-equality-operator.patch      | 33 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 pip/__init__.py                                    |  2 +-
 4 files changed, 37 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index be01ed2,0000000..09dd542
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- b42fc879de7be5e3a89a165f23fd0d43bfa5f2a2
- b42fc879de7be5e3a89a165f23fd0d43bfa5f2a2
++6cddedaac287e8d517b64d3858de71a405625afb
++6cddedaac287e8d517b64d3858de71a405625afb
 +eb72925c46a091b609d1ecfbe305d262398a76c3
 +eb72925c46a091b609d1ecfbe305d262398a76c3
 +python-pip_1.5.6.orig.tar.gz
 +e6cd9e6f2fd8d28c9976313632ef8aa8ac31249e
 +938120
diff --cc debian/patches/pep-440-arbitrary-equality-operator.patch
index 0000000,0000000..462ae9d
new file mode 100644
--- /dev/null
+++ b/debian/patches/pep-440-arbitrary-equality-operator.patch
@@@ -1,0 -1,0 +1,33 @@@
++From 6cddedaac287e8d517b64d3858de71a405625afb Mon Sep 17 00:00:00 2001
++From: Barry Warsaw <barry at debian.org>
++Date: Tue, 18 Aug 2015 11:05:51 -0400
++Subject: =?UTF-8?q?When=20calling=20`pip=20list`=20where=20some=20system?=
++ =?UTF-8?q?=20packages=20are=20installed=20with=20non-PEP=0A440=20complian?=
++ =?UTF-8?q?t=20version=20numbers,=20this=20assertion=20gets=20tripped.=20?=
++ =?UTF-8?q?=20E.g.=20python-apt's=0A1.0.0~beta3.1ubuntu1.=20=20In=20those?=
++ =?UTF-8?q?=20cases,=20the=20package's=20requirements=20use=20the=20PEP=0A?=
++ =?UTF-8?q?440=20'=3D=3D=3D'=20arbitrary=20equality=20operator,=20which=20?=
++ =?UTF-8?q?isn't=20supported=20in=20pip=201.5.6.=0AThis=20allows=20the=20a?=
++ =?UTF-8?q?ssertion=20to=20pass=20in=20those=20cases,=20without=20any=20kn?=
++ =?UTF-8?q?own=20side=0Aeffects.=20=20Thanks=20to=20upstream=20developer?=
++ =?UTF-8?q?=20Donald=20Stufft=20for=20assistance.?=
++
++Patch-Name: pep-440-arbitrary-equality-operator.patch
++Forwarded: not-needed
++---
++ pip/__init__.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/pip/__init__.py b/pip/__init__.py
++index eba984e..1c6deb3 100755
++--- a/pip/__init__.py
+++++ b/pip/__init__.py
++@@ -296,7 +296,7 @@ class FrozenRequirement(object):
++             editable = False
++             req = dist.as_requirement()
++             specs = req.specs
++-            assert len(specs) == 1 and specs[0][0] == '=='
+++            assert len(specs) == 1 and specs[0][0] in ('==', '==='), specs
++             version = specs[0][1]
++             ver_match = cls._rev_re.search(version)
++             date_match = cls._date_re.search(version)
diff --cc debian/patches/series
index fd43451,0000000..bd6e010
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,6 -1,0 +1,7 @@@
 +0001-Use-Debian-packages-instead-of-vendorized-versions.patch
 +0002-We-need-to-add-all-the-recursively-devendorized-depe.patch
 +0003-Provide-a-better-Debian-specific-error-message-when-.patch
 +0004-Use-randomized-install-directory.patch
 +0005-Prevent-pip-from-removing-system-installed-packages.patch
 +0006-bug-785787.patch
++pep-440-arbitrary-equality-operator.patch

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