[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 9d61cc106969db540942e93596d1ebfe6a32ce7a
Merge: f408406 ecb9787
Author: Barry Warsaw <barry at python.org>
Date:   Wed Aug 3 13:07:28 2016 -0400

    merge patched into master

 CHANGES.rst                                        | 114 +++++----
 PKG-INFO                                           | 261 +++++++++++++++++----
 README.rst                                         |   2 +-
 RELEASE.rst                                        | 112 +++++++++
 debian/.git-dpm                                    |   6 +-
 .../handle-pkg_resources-devendorization.patch     |   2 +-
 pex.egg-info/PKG-INFO                              | 261 +++++++++++++++++----
 pex.egg-info/SOURCES.txt                           |   4 +
 pex/bin/pex.py                                     |  53 ++++-
 pex/commands/bdist_pex.py                          |  12 +-
 pex/common.py                                      |  15 ++
 pex/compiler.py                                    |  22 +-
 pex/executor.py                                    |  96 ++++++++
 pex/http.py                                        |   2 +-
 pex/installer.py                                   |  33 ++-
 pex/interpreter.py                                 |  16 +-
 pex/pex.py                                         |  32 +--
 pex/pex_info.py                                    |   2 +-
 pex/testing.py                                     |  52 +++-
 pex/util.py                                        |  12 +-
 pex/variables.py                                   |   2 +-
 pex/version.py                                     |   2 +-
 setup.py                                           |  15 +-
 tests/test_bdist_pex.py                            |  33 +++
 tests/test_common.py                               |  44 ++++
 tests/test_executor.py                             | 103 ++++++++
 tests/test_inherits_path_option.py                 |   2 +
 tests/test_integration.py                          | 110 ++++++++-
 tests/test_pex.py                                  |  23 +-
 tests/test_pex_info.py                             |  11 +-
 tox.ini                                            |   7 +-
 31 files changed, 1226 insertions(+), 235 deletions(-)

diff --cc debian/.git-dpm
index 997f99e,0000000..75816d6
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
- b2bc006bd78d5b7e614582373b117fb45b1e1c01
- b2bc006bd78d5b7e614582373b117fb45b1e1c01
- f82c7318c880c46280745b20846781313a8dab12
++ecb9787a2bbdbfc8076dd96af47946e21142ffb3
++ecb9787a2bbdbfc8076dd96af47946e21142ffb3
++d17165483693016fbaced1cf900a880d70cedc61
 +d17165483693016fbaced1cf900a880d70cedc61
 +python-pex_1.1.14.orig.tar.gz
 +8abf61dead6c2db4da92f2874794333b50164ee9
 +480891
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/handle-pkg_resources-devendorization.patch
index ed3f4d5,0000000..3b41deb
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 b2bc006bd78d5b7e614582373b117fb45b1e1c01 Mon Sep 17 00:00:00 2001
++From ecb9787a2bbdbfc8076dd96af47946e21142ffb3 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