[Python-modules-commits] [python-pex] 02/07: 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-pex.

commit 0945d98eb3af2020b13d05881e124dc45c171a65
Merge: 9c045f5 a4f32e7
Author: Barry Warsaw <barry at python.org>
Date:   Wed Mar 25 10:46:45 2015 -0400

    merge patched into master

 debian/.git-dpm                        |  4 ++--
 debian/patches/modern-setuptools.patch | 26 ++++++++++++++++++++++++++
 debian/patches/series                  |  1 +
 setup.py                               |  2 +-
 4 files changed, 30 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 3f5746d,0000000..4fab4fc
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
- 5a53fd5b89920a5134773ad201cc4cb5b3750cb7
- 5a53fd5b89920a5134773ad201cc4cb5b3750cb7
++a4f32e7a2e382e3c750e67ab81055747f5900924
++a4f32e7a2e382e3c750e67ab81055747f5900924
 +5a53fd5b89920a5134773ad201cc4cb5b3750cb7
 +5a53fd5b89920a5134773ad201cc4cb5b3750cb7
 +python-pex_0.8.6.orig.tar.gz
 +56a37ca04305a6fab6964df3a2d48f924f14cb3a
 +57218
diff --cc debian/patches/modern-setuptools.patch
index 0000000,0000000..208399f
new file mode 100644
--- /dev/null
+++ b/debian/patches/modern-setuptools.patch
@@@ -1,0 -1,0 +1,26 @@@
++From a4f32e7a2e382e3c750e67ab81055747f5900924 Mon Sep 17 00:00:00 2001
++From: Barry Warsaw <barry at ubuntu.com>
++Date: Wed, 25 Mar 2015 10:46:09 -0400
++Subject: Ubuntu Vivid (15.04) has setuptools 12.2, so the upper limit in
++
++ the setup.py must be removed.  There's no good reason for it anyway.
++Bug: https://github.com/pantsbuild/pex/issues/55
++
++Patch-Name: modern-setuptools.patch
++---
++ setup.py | 2 +-
++ 1 file changed, 1 insertion(+), 1 deletion(-)
++
++diff --git a/setup.py b/setup.py
++index 1c899d7..6a45661 100644
++--- a/setup.py
+++++ b/setup.py
++@@ -36,7 +36,7 @@ setup(
++     'pex.bin',
++   ],
++   install_requires = [
++-    'setuptools>=2.2,<8',
+++    'setuptools>=2.2',
++   ],
++   tests_require = [
++     'mock',
diff --cc debian/patches/series
index 0000000,0000000..da04bff
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++modern-setuptools.patch

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