[Python-modules-commits] [python-pex] 05/10: merge patched into master
Barry Warsaw
barry at moszumanska.debian.org
Tue Mar 22 17:19:18 UTC 2016
This is an automated email from the git hooks/post-receive script.
barry pushed a commit to branch master
in repository python-pex.
commit 1f70c4f2f13ca62818dbba775abf916889c71479
Merge: 676510e 21b2ac1
Author: Barry Warsaw <barry at python.org>
Date: Tue Mar 22 13:09:50 2016 -0400
merge patched into master
CHANGES.rst | 31 ++++++++++++++
PKG-INFO | 33 ++++++++++++++-
debian/.git-dpm | 6 +--
debian/patches/bump-setuptools-max-version.patch | 6 +--
.../handle-pkg_resources-devendorization.patch | 2 +-
pex.egg-info/PKG-INFO | 33 ++++++++++++++-
pex.egg-info/SOURCES.txt | 3 +-
pex/commands/bdist_pex.py | 2 +-
pex/common.py | 41 +++++++++---------
pex/compatibility.py | 13 ++++++
pex/compiler.py | 4 +-
pex/crawler.py | 6 +--
pex/http.py | 2 +-
pex/installer.py | 6 ++-
pex/link.py | 21 ++++++---
pex/package.py | 4 +-
pex/pep425.py | 10 +++--
pex/pex.py | 15 +++++--
pex/resolver.py | 6 +--
pex/testing.py | 20 +++++++--
pex/translator.py | 4 +-
pex/util.py | 23 +++++++++-
pex/version.py | 2 +-
tests/example_packages/setuptools-18.0.1-py2.7.egg | Bin 0 -> 356249 bytes
tests/test_environment.py | 37 ++++++++--------
tests/test_http.py | 6 +--
tests/test_integration.py | 8 +++-
tests/test_link.py | 12 +++++-
tests/test_package.py | 9 ++++
tests/test_pep425.py | 14 +++++-
tests/test_pex.py | 47 ++++++++++++++++++++-
tests/test_pex_builder.py | 4 +-
tests/test_pex_info.py | 7 ++-
tests/test_util.py | 45 +++++++++++++-------
tests/test_variables.py | 9 ++--
tox.ini | 2 +-
36 files changed, 378 insertions(+), 115 deletions(-)
diff --cc debian/.git-dpm
index e6dcdbe,0000000..4856727
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
- 0674404bbae90fe0488c9dca1b5c3875615b5921
- 0674404bbae90fe0488c9dca1b5c3875615b5921
- ff2c3c04241dc688dc9dfdfd85898d587aa4253c
++21b2ac157d2006393b815583723b148727ac59e6
++21b2ac157d2006393b815583723b148727ac59e6
++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 bc81756,0000000..8f42051
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 6730486a38582d35aece0fc172064e43e0982707 Mon Sep 17 00:00:00 2001
++From 8fa0f017e5aa691f79636544396a9b82c4ac3a84 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
+--- a/pex.egg-info/requires.txt
++++ b/pex.egg-info/requires.txt
+@@ -1 +1 @@
+-setuptools>=2.2,<20
++setuptools>=2.2,<20.2
+diff --git a/pex/version.py b/pex/version.py
- index 51862fa..15579f1 100644
++index 1366236..d01125b 100644
+--- a/pex/version.py
++++ b/pex/version.py
+@@ -3,5 +3,5 @@
+
- __version__ = '1.1.2'
++ __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'
++WHEEL_REQUIREMENT = 'wheel>=0.24.0,<0.30.0'
diff --cc debian/patches/handle-pkg_resources-devendorization.patch
index ed88092,0000000..bef2c7e
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 0674404bbae90fe0488c9dca1b5c3875615b5921 Mon Sep 17 00:00:00 2001
++From 21b2ac157d2006393b815583723b148727ac59e6 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
More information about the Python-modules-commits
mailing list