Imported Upstream version 35.0.1

diff --git a/.travis.yml b/.travis.yml
index adb2f948d7fe9df26aea51c6399210027400876f..fd18a33a0dcab98468afe81145bfb73d1d5ed571 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -14,6 +14,9 @@ matrix:
     env: LC_ALL=C LC_CTYPE=C
   - python: 2.7
     env: LC_ALL=C LC_CTYPE=C
+  allow_failures:
+  # https://github.com/pypa/setuptools/issues/1015
+  - python: nightly
 script:
  # need tox and rwt to get started
  - pip install tox rwt

diff --git a/CHANGES.rst b/CHANGES.rst
index e6691486b2a8285940c025d07d46d3113de3fc3f..ebd183606a308a765edaabf95739b162860d83a1 100644 (file)
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -1,3 +1,14 @@
+v35.0.1
+-------
+
+* #992: Revert change introduced in v34.4.1, now
+  considered invalid.
+
+* #1016: Revert change introduced in v35.0.0 per #1014,
+  referencing #436. The approach had unintended
+  consequences, causing sdist installs to be missing
+  files.
+
 v35.0.0
 -------
 

diff --git a/setup.cfg b/setup.cfg
index 57ca3d501fc27fedb7a4a7b65134673c438c89dd..da62ac4fcfa0260b7f8521caa6205045666f5403 100755 (executable)
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 35.0.0
+current_version = 35.0.1
 commit = True
 tag = True
 

diff --git a/setup.py b/setup.py
index 328941c13da07872a75e974b0efd0c6072cf06f7..df73251175bc73a4c724713f546a0b483423a115 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -89,7 +89,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="35.0.0",
+    version="35.0.1",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

diff --git a/setuptools/command/egg_info.py b/setuptools/command/egg_info.py
index 21bbfb72de2b3da5f1e8276f7c075e2197d07350..1a6ea9cb570b5710557a8ac28c6a59da9c6d44d5 100755 (executable)
--- a/setuptools/command/egg_info.py
+++ b/setuptools/command/egg_info.py
@@ -564,6 +564,8 @@ class manifest_maker(sdist):
         rcfiles = list(walk_revctrl())
         if rcfiles:
             self.filelist.extend(rcfiles)
+        elif os.path.exists(self.manifest):
+            self.read_manifest()
         ei_cmd = self.get_finalized_command('egg_info')
         self.filelist.graft(ei_cmd.egg_info)
 

diff --git a/setuptools/msvc.py b/setuptools/msvc.py
index 3110eaffe3a9cbdc891bd75cccf49e8874f882b5..84dcb2a78ac7d169f754526d8f50db726e7555d2 100644 (file)
--- a/setuptools/msvc.py
+++ b/setuptools/msvc.py
@@ -27,7 +27,6 @@ from packaging.version import LegacyVersion
 from six.moves import filterfalse
 
 from .monkey import get_unpatched
-from . import py27compat
 
 if platform.system() == 'Windows':
     from six.moves import winreg
@@ -136,13 +135,11 @@ def msvc9_query_vcvarsall(ver, arch='x86', *args, **kwargs):
 
     # If error, try to set environment directly
     try:
-        env = EnvironmentInfo(arch, ver).return_env()
+        return EnvironmentInfo(arch, ver).return_env()
     except distutils.errors.DistutilsPlatformError as exc:
         _augment_exception(exc, ver, arch)
         raise
 
-    return py27compat.dict_values_strings(env)
-
 
 def msvc14_get_vc_env(plat_spec):
     """

diff --git a/setuptools/py27compat.py b/setuptools/py27compat.py
index 0f92488945b865c9fba82264b23e14fd464ff11e..701283c8c17d5201896851ed6c8c703a858950aa 100644 (file)
--- a/setuptools/py27compat.py
+++ b/setuptools/py27compat.py
@@ -26,17 +26,3 @@ linux_py2_ascii = (
 
 rmtree_safe = str if linux_py2_ascii else lambda x: x
 """Workaround for http://bugs.python.org/issue24672"""
-
-
-def dict_values_strings(dict_):
-    """
-    Given a dict, make sure the text values are str.
-    """
-    if six.PY3:
-        return dict_
-
-    # When dropping Python 2.6 support, use a dict constructor
-    return dict(
-        (key, str(value))
-        for key, value in dict_.iteritems()
-    )

diff --git a/setuptools/tests/test_integration.py b/setuptools/tests/test_integration.py
index cb62eb2957037d56f6ac5fb0219d7ade243ac406..2acec91b98e1b140296c930ebfca3b834e138574 100644 (file)
--- a/setuptools/tests/test_integration.py
+++ b/setuptools/tests/test_integration.py
@@ -99,6 +99,21 @@ def test_python_novaclient(install_context):
     _install_one('python-novaclient', install_context,
                  'novaclient', 'base.py')
 
+
+def test_pyuri(install_context):
+    """
+    Install the pyuri package (version 0.3.1 at the time of writing).
+
+    This is also a regression test for issue #1016.
+    """
+    _install_one('pyuri', install_context, 'pyuri', 'uri.py')
+
+    pyuri = install_context.installed_projects['pyuri']
+
+    # The package data should be installed.
+    assert os.path.exists(os.path.join(pyuri.location, 'pyuri', 'uri.regex'))
+
+
 import re
 import subprocess
 import functools