[Python-modules-commits] [python-pex] 09/10: 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 5fa65435ee00bc28df2bb6ce3039002f1b924731
Merge: bc1810f 1c903a8
Author: Barry Warsaw <barry at python.org>
Date:   Tue Mar 22 13:17:21 2016 -0400

    merge patched into master

 debian/.git-dpm                                           |  4 ++--
 debian/patches/bump-setuptools-max-version.patch          | 10 +++++-----
 debian/patches/handle-pkg_resources-devendorization.patch |  2 +-
 pex.egg-info/requires.txt                                 |  2 +-
 pex/version.py                                            |  2 +-
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --cc debian/.git-dpm
index 4856727,0000000..ab56305
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
- 21b2ac157d2006393b815583723b148727ac59e6
- 21b2ac157d2006393b815583723b148727ac59e6
++1c903a85e39cd3fa74bd4159e72c1dbee2024cdd
++1c903a85e39cd3fa74bd4159e72c1dbee2024cdd
 +29506132c8cc219ccd6293ea037df31210fab499
 +29506132c8cc219ccd6293ea037df31210fab499
 +python-pex_1.1.4.orig.tar.gz
 +619ceef320b42cb53c7de38eb5f67dd2b7880539
 +463001
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/bump-setuptools-max-version.patch
index 8f42051,0000000..0548086
mode 100644,000000..100644
--- a/debian/patches/bump-setuptools-max-version.patch
+++ b/debian/patches/bump-setuptools-max-version.patch
@@@ -1,32 -1,0 +1,32 @@@
- From 8fa0f017e5aa691f79636544396a9b82c4ac3a84 Mon Sep 17 00:00:00 2001
++From d201ac8b0344d51a2e76ae295e6fe57faaa438ca Mon Sep 17 00:00:00 2001
 +From: Barry Warsaw <barry at debian.org>
 +Date: Thu, 13 Aug 2015 17:53:22 -0400
 +Subject: =?UTF-8?q?Bump=20setuptools=20maximum=20requirement=20to=20coinci?=
 + =?UTF-8?q?de=20with=20what's=20available=20in=0ADebian,=20otherwise=20the?=
 + =?UTF-8?q?=20manpage=20won't=20build.?=
 +
 +Patch-Name: bump-setuptools-max-version.patch
 +---
 + pex.egg-info/requires.txt | 2 +-
 + pex/version.py            | 4 ++--
 + 2 files changed, 3 insertions(+), 3 deletions(-)
 +
 +diff --git a/pex.egg-info/requires.txt b/pex.egg-info/requires.txt
- index 4ea40c9..9dc1223 100644
++index 4ea40c9..e351c78 100644
 +--- a/pex.egg-info/requires.txt
 ++++ b/pex.egg-info/requires.txt
 +@@ -1 +1 @@
 +-setuptools>=2.2,<20
- +setuptools>=2.2,<20.2
+++setuptools>=2.2,<20.4
 +diff --git a/pex/version.py b/pex/version.py
- index 1366236..d01125b 100644
++index 1366236..66dc44e 100644
 +--- a/pex/version.py
 ++++ b/pex/version.py
 +@@ -3,5 +3,5 @@
 + 
 + __version__ = '1.1.4'
 + 
 +-SETUPTOOLS_REQUIREMENT = 'setuptools>=2.2,<20'
 +-WHEEL_REQUIREMENT = 'wheel>=0.24.0,<0.27.0'
- +SETUPTOOLS_REQUIREMENT = 'setuptools>=2.2,<20.2'
+++SETUPTOOLS_REQUIREMENT = 'setuptools>=2.2,<20.4'
 ++WHEEL_REQUIREMENT = 'wheel>=0.24.0,<0.30.0'
diff --cc debian/patches/handle-pkg_resources-devendorization.patch
index bef2c7e,0000000..a2fec9d
mode 100644,000000..100644
--- a/debian/patches/handle-pkg_resources-devendorization.patch
+++ b/debian/patches/handle-pkg_resources-devendorization.patch
@@@ -1,36 -1,0 +1,36 @@@
- From 21b2ac157d2006393b815583723b148727ac59e6 Mon Sep 17 00:00:00 2001
++From 1c903a85e39cd3fa74bd4159e72c1dbee2024cdd Mon Sep 17 00:00:00 2001
 +From: Barry Warsaw <barry at debian.org>
 +Date: Thu, 13 Aug 2015 18:21:53 -0400
 +Subject: Work around Debian's devendorizing of pkg_resource dependencies.
 +
 +Forwarded: not-needed
 +Patch-Name: handle-pkg_resources-devendorization.patch
 +---
 + pex/pex_bootstrapper.py | 14 ++++++++++++++
 + 1 file changed, 14 insertions(+)
 +
 +diff --git a/pex/pex_bootstrapper.py b/pex/pex_bootstrapper.py
 +index 137757f..f2aaa45 100644
 +--- a/pex/pex_bootstrapper.py
 ++++ b/pex/pex_bootstrapper.py
 +@@ -94,6 +94,20 @@ def bootstrap_pex(entry_point):
 +   register_finders()
 +   maybe_reexec_pex()
 + 
 ++  # 2015-03-24 BAW (Debian/Ubuntu): This will make grown Pythonistas weep.  In
 ++  # Debian, we devendorize pkg_resources by removing all its bundled
 ++  # dependencies and making it use the system versions.  This plays havoc with
 ++  # pex though, because pex messes with sys.path and sys.modules and ends up
 ++  # double importing sub-modules from pkg_resources.  This confuses Python
 ++  # deeply, resulting in AttributeError tracebacks when pkg_resources itself
 ++  # tries to dig sub-modules out of its own namespace.  Yes, AttributeErrors,
 ++  # not ImportErrors.  By pure trial and error, this seems to work around the
 ++  # problem.
 ++  import sys
 ++  for modname in list(sys.modules):
 ++    if modname.startswith('pkg_resources.'):
 ++      del sys.modules[modname]
 ++
 +   from . import pex
 +   pex.PEX(entry_point).execute()
 + 

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