[Python-modules-commits] [python-pex] 04/05: 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 4c7cd306a940727d7366761c0587a6e8202ff40a
Merge: 5d95ea2 b2bc006
Author: Barry Warsaw <barry at python.org>
Date:   Mon May 9 16:02:05 2016 -0400

    merge patched into master

 CHANGES.rst                                        | 35 ++++++++++++++-
 PKG-INFO                                           | 37 +++++++++++++++-
 debian/.git-dpm                                    |  6 +--
 debian/patches/bump-setuptools-max-version.patch   | 32 --------------
 .../handle-pkg_resources-devendorization.patch     |  2 +-
 debian/patches/series                              |  1 -
 pex.egg-info/PKG-INFO                              | 37 +++++++++++++++-
 pex.egg-info/SOURCES.txt                           |  2 +
 pex.egg-info/requires.txt                          |  2 +-
 pex/commands/bdist_pex.py                          | 34 +++++++++++----
 pex/compatibility.py                               |  8 ++++
 pex/package.py                                     |  6 +--
 pex/pex.py                                         | 24 ++++++-----
 pex/pex_builder.py                                 | 11 +++--
 pex/version.py                                     |  4 +-
 tests/test_bdist_pex.py                            | 50 ++++++++++++++++++++++
 tests/test_inherits_path_option.py                 | 41 ++++++++++++++++++
 tests/test_package.py                              | 11 ++++-
 tests/test_pex_builder.py                          | 38 +++++++++-------
 tox.ini                                            | 28 ++++++++----
 20 files changed, 314 insertions(+), 95 deletions(-)

diff --cc debian/.git-dpm
index 33af0a9,0000000..444961b
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
- 1c903a85e39cd3fa74bd4159e72c1dbee2024cdd
- 1c903a85e39cd3fa74bd4159e72c1dbee2024cdd
- 29506132c8cc219ccd6293ea037df31210fab499
++b2bc006bd78d5b7e614582373b117fb45b1e1c01
++b2bc006bd78d5b7e614582373b117fb45b1e1c01
++f82c7318c880c46280745b20846781313a8dab12
 +f82c7318c880c46280745b20846781313a8dab12
 +python-pex_1.1.6.orig.tar.gz
 +574e86dbf24b2dea1e3414b71761fcc4eded648b
 +472432
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/handle-pkg_resources-devendorization.patch
index a2fec9d,0000000..ed3f4d5
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 1c903a85e39cd3fa74bd4159e72c1dbee2024cdd Mon Sep 17 00:00:00 2001
++From b2bc006bd78d5b7e614582373b117fb45b1e1c01 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()
 + 
diff --cc debian/patches/series
index ccc0d2e,0000000..597ac42
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
- bump-setuptools-max-version.patch
 +handle-pkg_resources-devendorization.patch

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