[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 dd829e3037da133a34b54702c22c3632871ba30c
Merge: d9708df 03c984b
Author: Barry Warsaw <barry at debian.org>
Date:   Fri Jul 17 16:18:22 2015 -0400

    merge patched into master

 CHANGES.rst                                        | 14 ++++
 PKG-INFO                                           | 16 +++-
 debian/.git-dpm                                    |  6 +-
 .../handle-pkg_resources-devendorization.patch     |  2 +-
 docs/whatispex.rst                                 |  2 +-
 pex.egg-info/PKG-INFO                              | 16 +++-
 pex.egg-info/SOURCES.txt                           |  3 +-
 pex/common.py                                      |  3 +-
 pex/compiler.py                                    | 90 ++++++++++++++++++++++
 pex/environment.py                                 |  5 +-
 pex/link.py                                        |  3 +
 pex/marshaller.py                                  | 86 ---------------------
 pex/pex_builder.py                                 | 56 +++++++++-----
 pex/resolver.py                                    | 29 ++++++-
 pex/testing.py                                     | 15 ++--
 pex/version.py                                     |  2 +-
 tests/test_compiler.py                             | 72 +++++++++++++++++
 tests/test_environment.py                          |  2 +-
 tests/test_link.py                                 |  5 ++
 tests/test_pex_builder.py                          | 57 ++++++++++++++
 tests/test_resolver.py                             | 34 ++++++++
 21 files changed, 392 insertions(+), 126 deletions(-)

diff --cc debian/.git-dpm
index dc98b2f,0000000..0dc4da4
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
- 7ac33d1c1f5be417901641525ed7df7142ddf41d
- 7ac33d1c1f5be417901641525ed7df7142ddf41d
- c2741933fcfdcb174102c812f69a68004d704773
++03c984b2b1ad2bbac4788e7f5c012123d29b21ee
++03c984b2b1ad2bbac4788e7f5c012123d29b21ee
++7ccc33838db1d5fcf9e16fb478a1be8f44a04fa3
 +7ccc33838db1d5fcf9e16fb478a1be8f44a04fa3
 +python-pex_1.0.1.orig.tar.gz
 +7778c1b365f278fee70d90561a9164a987a5c162
 +105121
diff --cc debian/patches/handle-pkg_resources-devendorization.patch
index 8f6feb8,0000000..d1d1bfc
mode 100644,000000..100644
--- a/debian/patches/handle-pkg_resources-devendorization.patch
+++ b/debian/patches/handle-pkg_resources-devendorization.patch
@@@ -1,37 -1,0 +1,37 @@@
- From 7ac33d1c1f5be417901641525ed7df7142ddf41d Mon Sep 17 00:00:00 2001
++From 03c984b2b1ad2bbac4788e7f5c012123d29b21ee Mon Sep 17 00:00:00 2001
 +From: Barry Warsaw <barry at ubuntu.com>
 +Date: Wed, 25 Mar 2015 10:48:51 -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 586c788..401b2a7 100644
 +--- a/pex/pex_bootstrapper.py
 ++++ b/pex/pex_bootstrapper.py
 +@@ -95,6 +95,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