[Python-modules-commits] [python-pex] 02/03: merge patched-dep8 into dep8

[Barry Warsaw]

This is an automated email from the git hooks/post-receive script.

barry pushed a commit to branch dep8
in repository python-pex.

commit f68fda9593bd3c460882442c918d01af34f22a41
Merge: ed59562 6689e78
Author: Barry Warsaw <barry at debian.org>
Date:   Fri Oct 9 16:31:51 2015 -0400

    merge patched-dep8 into dep8

 debian/.git-dpm                                  |  4 ++--
 debian/patches/bump-setuptools-max-version.patch |  4 +++-
 debian/patches/debugging.patch                   | 22 ++++++++++++++++++++++
 debian/patches/series                            |  1 +
 pex/pex_builder.py                               |  1 +
 5 files changed, 29 insertions(+), 3 deletions(-)

diff --cc debian/.git-dpm
index 6e9ac7d,0000000..115b4e9
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
- 4973b1c7297170a595e6d21fde776a75ab7f8acc
- 4973b1c7297170a595e6d21fde776a75ab7f8acc
++6689e78493b7731dac4581147851c00f88e696a1
++6689e78493b7731dac4581147851c00f88e696a1
 +5053627b97fcec5fe41e5714cb6b21529b46d5dd
 +5053627b97fcec5fe41e5714cb6b21529b46d5dd
 +python-pex_1.0.3.orig.tar.gz
 +7a8182da2bc74b8a06a0a00289244fda6586daf6
 +106905
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/bump-setuptools-max-version.patch
index 3dbd998,0000000..6902a4f
mode 100644,000000..100644
--- a/debian/patches/bump-setuptools-max-version.patch
+++ b/debian/patches/bump-setuptools-max-version.patch
@@@ -1,29 -1,0 +1,31 @@@
 +From e497a82aa8ffdbd3e1fd5dfb2c976b37d97d9c05 Mon Sep 17 00:00:00 2001
 +From: Barry Warsaw <barry at debian.org>
 +Date: Thu, 13 Aug 2015 17:53:22 -0400
- Subject: Bump setuptools maximum requirement to match Debian.
++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(-)
 +
 +diff --git a/pex.egg-info/requires.txt b/pex.egg-info/requires.txt
 +index 00e3615..646aa98 100644
 +--- a/pex.egg-info/requires.txt
 ++++ b/pex.egg-info/requires.txt
 +@@ -1 +1 @@
 +-setuptools>=2.2,<16
 ++setuptools>=2.2,<19
 +diff --git a/pex/version.py b/pex/version.py
 +index c7d1aea..7e9a8a3 100644
 +--- a/pex/version.py
 ++++ b/pex/version.py
 +@@ -3,5 +3,5 @@
 + 
 + __version__ = '1.0.3'
 + 
 +-SETUPTOOLS_REQUIREMENT = 'setuptools>=2.2,<16'
 ++SETUPTOOLS_REQUIREMENT = 'setuptools>=2.2,<19'
 + WHEEL_REQUIREMENT = 'wheel>=0.24.0,<0.25.0'
diff --cc debian/patches/debugging.patch
index 0000000,0000000..613b7c3
new file mode 100644
--- /dev/null
+++ b/debian/patches/debugging.patch
@@@ -1,0 -1,0 +1,22 @@@
++From 6689e78493b7731dac4581147851c00f88e696a1 Mon Sep 17 00:00:00 2001
++From: Barry Warsaw <barry at debian.org>
++Date: Fri, 9 Oct 2015 16:31:23 -0400
++Subject: Add some debugging.
++
++Patch-Name: debugging.patch
++---
++ pex/pex_builder.py | 1 +
++ 1 file changed, 1 insertion(+)
++
++diff --git a/pex/pex_builder.py b/pex/pex_builder.py
++index 5410fc9..996a66b 100644
++--- a/pex/pex_builder.py
+++++ b/pex/pex_builder.py
++@@ -360,6 +360,7 @@ class PEXBuilder(object):
++     for fn, content_stream in DistributionHelper.walk_data(setuptools):
++       if fn.startswith('pkg_resources') or fn.startswith('_markerlib'):
++         if not fn.endswith('.pyc'):  # We'll compile our own .pyc's later.
+++          print('=====>', fn)
++           dst = os.path.join(self.BOOTSTRAP_DIR, fn)
++           self._chroot.write(content_stream.read(), dst, 'bootstrap')
++           wrote_setuptools = True
diff --cc debian/patches/series
index ccc0d2e,0000000..0ada266
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +bump-setuptools-max-version.patch
 +handle-pkg_resources-devendorization.patch
++debugging.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/python-pex.git