Imported Upstream version 36.0.1

diff --git a/.travis.yml b/.travis.yml
index fa26015f2f890bbae55cb6bd6103ba892d70cf5b..6d6333f8717bd039e0910b0858ab75fab60832ef 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -27,8 +27,6 @@ script:
  #- python -m tox
  - tox
 
-before_deploy:
-  - pip install -r requirements.txt
 deploy:
   provider: pypi
   # Also update server in setup.cfg

diff --git a/CHANGES.rst b/CHANGES.rst
index bc13fd8c6b8224662ed0f6c25cfd166bd50b41e6..b2d1ed9a90d44c9483a2e0fb8926abf1c26c807a 100644 (file)
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,10 @@
+v36.0.1
+-------
+
+* #1042: Fix import in py27compat module that still
+  referenced six directly, rather than through the externs
+  module (vendored packages hook).
+
 v36.0.0
 -------
 

diff --git a/setup.cfg b/setup.cfg
index e39b524d219204a9a8091a75835a35a43f5fcb25..b5199a625fb2e3634e553cc3fba41837737861c2 100755 (executable)
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 36.0.0
+current_version = 36.0.1
 commit = True
 tag = True
 

diff --git a/setup.py b/setup.py
index 9250e073d465019d0989c9a8fc5464882872edc9..6eaac16ad5207e9c81d4579f892ffd574252d7d1 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="36.0.0",
+    version="36.0.1",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

diff --git a/setuptools/py27compat.py b/setuptools/py27compat.py
index 701283c8c17d5201896851ed6c8c703a858950aa..2985011b92f7449e784f5f056dd24ffd991d24bd 100644 (file)
--- a/setuptools/py27compat.py
+++ b/setuptools/py27compat.py
@@ -4,7 +4,7 @@ Compatibility Support for Python 2.7 and earlier
 
 import platform
 
-import six
+from setuptools.extern import six
 
 
 def get_all_headers(message, key):