[Python-modules-commits] [python-pex] 05/07: merge patched into master
Barry Warsaw
barry at moszumanska.debian.org
Mon Feb 22 20:58:39 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 b949b5022757a3cf8ea8b332c9bfdafd458a919d
Merge: 8b4a606 0674404
Author: Barry Warsaw <barry at python.org>
Date: Mon Feb 22 15:54:38 2016 -0500
merge patched into master
CHANGES.rst | 26 +++++++++
PKG-INFO | 28 ++++++++-
debian/.git-dpm | 6 +-
debian/patches/bump-setuptools-max-version.patch | 23 ++++----
.../patches/bump-wheel-requirement-version.patch | 22 -------
.../handle-pkg_resources-devendorization.patch | 6 +-
debian/patches/series | 1 -
pex.egg-info/PKG-INFO | 28 ++++++++-
pex.egg-info/requires.txt | 2 +-
pex/crawler.py | 41 +++++++++++--
pex/pex_bootstrapper.py | 3 +-
pex/resolver.py | 3 +-
pex/variables.py | 2 +-
pex/version.py | 6 +-
scripts/coverage.sh | 2 +-
tests/test_crawler.py | 68 +++++++++++++++++++++-
tests/test_integration.py | 17 +++++-
17 files changed, 225 insertions(+), 59 deletions(-)
diff --cc debian/.git-dpm
index 2fcbfed,0000000..386f013
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
- bf7414e6aec67f28a078b731320d3c67e6ffa63f
- bf7414e6aec67f28a078b731320d3c67e6ffa63f
- 60f09e69d346fbc81698e9d028dacec68f16639a
++0674404bbae90fe0488c9dca1b5c3875615b5921
++0674404bbae90fe0488c9dca1b5c3875615b5921
++ff2c3c04241dc688dc9dfdfd85898d587aa4253c
+ff2c3c04241dc688dc9dfdfd85898d587aa4253c
+python-pex_1.1.2.orig.tar.gz
+abb1923de2d27acd4953d4bc79c3d190f06ba521
+111202
+debianTag="debian/%e%v"
+patchedTag="patched/%e%v"
+upstreamTag="upstream/%e%u"
diff --cc debian/patches/bump-setuptools-max-version.patch
index 2c6d3f5,0000000..bc81756
mode 100644,000000..100644
--- a/debian/patches/bump-setuptools-max-version.patch
+++ b/debian/patches/bump-setuptools-max-version.patch
@@@ -1,31 -1,0 +1,32 @@@
- From 14660f773325406fe72752b5b0a04508117dcf2e Mon Sep 17 00:00:00 2001
++From 6730486a38582d35aece0fc172064e43e0982707 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 | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
++ 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 00e3615..646aa98 100644
++index 4ea40c9..9dc1223 100644
+--- a/pex.egg-info/requires.txt
++++ b/pex.egg-info/requires.txt
+@@ -1 +1 @@
- -setuptools>=2.2,<16
- +setuptools>=2.2,<19
++-setuptools>=2.2,<20
+++setuptools>=2.2,<20.2
+diff --git a/pex/version.py b/pex/version.py
- index 395b068..6e7ac2d 100644
++index 51862fa..15579f1 100644
+--- a/pex/version.py
++++ b/pex/version.py
+@@ -3,5 +3,5 @@
+
- __version__ = '1.1.0'
++ __version__ = '1.1.2'
+
- -SETUPTOOLS_REQUIREMENT = 'setuptools>=2.2,<16'
- +SETUPTOOLS_REQUIREMENT = 'setuptools>=2.2,<19'
- WHEEL_REQUIREMENT = 'wheel>=0.24.0,<0.25.0'
++-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 a0c74c4,0000000..ed88092
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 e85783b61e7928533a56da72b7fc67f7197f7266 Mon Sep 17 00:00:00 2001
++From 0674404bbae90fe0488c9dca1b5c3875615b5921 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 586c788..401b2a7 100644
++index 137757f..f2aaa45 100644
+--- a/pex/pex_bootstrapper.py
++++ b/pex/pex_bootstrapper.py
- @@ -95,6 +95,20 @@ def bootstrap_pex(entry_point):
++@@ -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 4ae1295,0000000..ccc0d2e
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,2 @@@
+bump-setuptools-max-version.patch
+handle-pkg_resources-devendorization.patch
- bump-wheel-requirement-version.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