[Python-modules-commits] [python-pex] 04/06: merge patched into master
Barry Warsaw
barry at moszumanska.debian.org
Tue Jun 2 19:01:29 UTC 2015
This is an automated email from the git hooks/post-receive script.
barry pushed a commit to branch master
in repository python-pex.
commit b94c872651070878b9f357d6ae4366e0c515a376
Merge: 51bea7c 7ac33d1
Author: Barry Warsaw <barry at debian.org>
Date: Tue Jun 2 14:15:31 2015 -0400
merge patched into master
CHANGES.rst | 93 +++-
LICENSE | 201 ++++++++
MANIFEST.in | 8 +-
PKG-INFO | 95 +++-
README.rst | 77 +--
debian/.git-dpm | 6 +-
.../handle-pkg_resources-devendorization.patch | 10 +-
debian/patches/modern-setuptools.patch | 24 -
debian/patches/series | 1 -
docs/Makefile | 177 +++++++
docs/api/index.rst | 159 ++++++
docs/buildingpex.rst | 330 +++++++++++++
docs/conf.py | 273 +++++++++++
docs/index.rst | 31 ++
docs/rtd/requirements.txt | 2 +
docs/whatispex.rst | 47 ++
pex.egg-info/PKG-INFO | 95 +++-
pex.egg-info/SOURCES.txt | 45 +-
pex.egg-info/entry_points.txt | 2 +-
pex.egg-info/requires.txt | 5 +-
pex/archiver.py | 3 +
pex/base.py | 2 +-
pex/bin/pex.py | 534 ++++++++++++++-------
pex/common.py | 9 +
pex/crawler.py | 6 +
pex/environment.py | 65 ++-
pex/fetcher.py | 22 +-
pex/finders.py | 60 ++-
pex/http.py | 21 +-
pex/installer.py | 6 +-
pex/interpreter.py | 7 +-
pex/iterator.py | 79 ++-
pex/link.py | 3 +
pex/pex.py | 268 +++++++----
pex/pex_bootstrapper.py | 33 +-
pex/pex_builder.py | 99 ++--
pex/pex_info.py | 73 +--
pex/requirements.py | 94 ++++
pex/resolvable.py | 295 ++++++++++++
pex/resolver.py | 377 +++++++++------
pex/resolver_options.py | 174 +++++++
pex/sorter.py | 37 ++
pex/testing.py | 24 +-
pex/tracer.py | 27 +-
pex/translator.py | 16 +-
pex/util.py | 42 +-
pex/variables.py | 265 ++++++++++
pex/version.py | 8 +-
scripts/combine_coverage.py | 68 +++
scripts/coverage.sh | 7 +
scripts/do_nothing.py | 0
setup.py | 12 +-
tests/test_archiver.py | 28 ++
tests/test_compatibility.py | 18 +
tests/test_crawler.py | 105 ++++
tests/test_environment.py | 96 ++++
tests/test_fetcher.py | 18 +
tests/test_finders.py | 101 ++++
tests/test_http.py | 240 +++++++++
tests/test_integration.py | 32 ++
tests/test_interpreter.py | 23 +
tests/test_iterator.py | 38 ++
tests/test_link.py | 54 +++
tests/test_package.py | 52 ++
tests/test_pep425.py | 51 ++
tests/test_pex.py | 134 ++++++
tests/test_pex_binary.py | 82 ++++
tests/test_pex_bootstrapper.py | 31 ++
tests/test_pex_builder.py | 67 +++
tests/test_pex_info.py | 34 ++
tests/test_platform.py | 58 +++
tests/test_requirements.py | 113 +++++
tests/test_resolvable.py | 113 +++++
tests/test_resolver.py | 59 +++
tests/test_sorter.py | 45 ++
tests/test_translator.py | 39 ++
tests/test_util.py | 158 ++++++
tests/test_variables.py | 74 +++
tox.ini | 134 ++++++
79 files changed, 5740 insertions(+), 674 deletions(-)
diff --cc debian/.git-dpm
index e546666,0000000..fe68ced
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
- 342f85998e64ef0ded447fe1ac98968e0946d525
- 342f85998e64ef0ded447fe1ac98968e0946d525
- 5a53fd5b89920a5134773ad201cc4cb5b3750cb7
++7ac33d1c1f5be417901641525ed7df7142ddf41d
++7ac33d1c1f5be417901641525ed7df7142ddf41d
++c2741933fcfdcb174102c812f69a68004d704773
+c2741933fcfdcb174102c812f69a68004d704773
+python-pex_1.0.0.orig.tar.gz
+e31755c94b2cb77d8a1c682947376dde5e145220
+102446
diff --cc debian/patches/handle-pkg_resources-devendorization.patch
index 7e4484a,0000000..8f6feb8
mode 100644,000000..100644
--- a/debian/patches/handle-pkg_resources-devendorization.patch
+++ b/debian/patches/handle-pkg_resources-devendorization.patch
@@@ -1,35 -1,0 +1,37 @@@
- From 342f85998e64ef0ded447fe1ac98968e0946d525 Mon Sep 17 00:00:00 2001
++From 7ac33d1c1f5be417901641525ed7df7142ddf41d 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 d47683e..9ff60d1 100644
++index 586c788..401b2a7 100644
+--- a/pex/pex_bootstrapper.py
++++ b/pex/pex_bootstrapper.py
- @@ -64,6 +64,20 @@ def bootstrap_pex(entry_point):
- monkeypatch_build_zipmanifest()
++@@ -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()
+
diff --cc debian/patches/series
index c61c045,0000000..597ac42
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,1 @@@
- modern-setuptools.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
More information about the Python-modules-commits
mailing list