[Python-modules-commits] [python-pex] 01/04: Merge branch 'master' into ubuntu.

[Barry Warsaw]

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

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

commit 371823fe9df75e2242cf45de73cab8aa2f4cc239
Merge: ed59562 7900e1a
Author: Barry Warsaw <barry at debian.org>
Date:   Mon Oct 12 16:15:17 2015 -0400

    Merge branch 'master' into ubuntu.

 CHANGES.rst                                        |  28 +++-
 PKG-INFO                                           |  30 +++-
 debian/.git-dpm                                    |  14 +-
 debian/changelog                                   |   7 +
 debian/control                                     |   1 +
 debian/patches/bump-setuptools-max-version.patch   |  10 +-
 .../handle-pkg_resources-devendorization.patch     |   2 +-
 docs/buildingpex.rst                               | 173 ++++++++++++++++-----
 docs/conf.py                                       |  12 +-
 docs/index.rst                                     |  17 +-
 pex.egg-info/PKG-INFO                              |  30 +++-
 pex.egg-info/SOURCES.txt                           |   2 +
 pex.egg-info/entry_points.txt                      |   3 +
 pex/commands/__init__.py                           |   0
 pex/commands/bdist_pex.py                          |  85 ++++++++++
 pex/http.py                                        |   7 +-
 pex/installer.py                                   |   2 +-
 pex/pex.py                                         |   8 +-
 pex/pex_builder.py                                 |  13 +-
 pex/pex_info.py                                    |   3 +-
 pex/resolver.py                                    |  16 +-
 pex/variables.py                                   |  33 +++-
 pex/version.py                                     |   2 +-
 setup.py                                           |   4 +
 tests/test_resolver.py                             |  10 +-
 tests/test_util.py                                 |  43 ++---
 tests/test_variables.py                            |  34 ++++
 tox.ini                                            |   2 +-
 28 files changed, 474 insertions(+), 117 deletions(-)

diff --cc debian/changelog
index 16aa4ae,c7b8372..d9f4f75
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,10 +1,20 @@@
+ python-pex (1.1.0-1) UNRELEASED; urgency=medium
+ 
+   * New upstream release.
+   * d/control: Added python3-pkg-resources to pex Depends.
+ 
+  -- Barry Warsaw <barry at debian.org>  Fri, 09 Oct 2015 17:06:43 -0400
+ 
 +python-pex (1.0.3-2ubuntu1) wily; urgency=medium
 +
 +  * Merge with Debian.  Remaining changes:
 +    - d/tests/control: Add dependency on ubuntu-drivers-common.  This
 +      generally should not be necessary except for LP: #1485093 in
 +      python3-distupgrade which causes the autopkgtest.ubuntu.com DEP-8
 +      tests to fail.
 +
 + -- Barry Warsaw <barry at ubuntu.com>  Thu, 08 Oct 2015 09:44:19 -0400
 +
  python-pex (1.0.3-2) unstable; urgency=medium
  
    * d/control:

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