Merge branch 'remote_pypa_master' into feat/setupcfg_handling

.travis.yml

@@ -24,8 +24,6 @@ script:
  #- python -m tox
  - tox
 
-before_deploy:
-  - export SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES=1
 deploy:
   provider: pypi
   # Also update server in setup.cfg

CHANGES.rst

@@ -2,6 +2,16 @@
 CHANGES
 =======
 
+v29.0.1
+-------
+
+* #861: Re-release of v29.0.1 with the executable script
+  launchers bundled. Now, launchers are included by default
+  and users that want to disable this behavior must set the
+  environment variable
+  'SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES' to
+  a false value like "false" or "0".
+
 v29.0.0
 -------
 

setup.cfg

 [bumpversion]
-current_version = 29.0.0
+current_version = 29.0.1
 commit = True
 tag = True
 

setup.py

@@ -54,8 +54,8 @@ package_data = dict(
 )
 
 force_windows_specific_files = (
-    os.environ.get("SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES")
-    not in (None, "", "0")
+    os.environ.get("SETUPTOOLS_INSTALL_WINDOWS_SPECIFIC_FILES", "1").lower()
+    not in ("", "0", "false", "no")
 )
 
 include_windows_files = (
@@ -85,7 +85,7 @@ def pypi_link(pkg_filename):
 
 setup_params = dict(
     name="setuptools",
-    version="29.0.0",
+    version="29.0.1",
     description="Easily download, build, install, upgrade, and uninstall "
         "Python packages",
     author="Python Packaging Authority",

setuptools/tests/test_namespaces.py

@@ -13,7 +13,7 @@ class TestNamespaces:
 
     @pytest.mark.xfail(sys.version_info < (3, 3),
         reason="Requires PEP 420")
-    @pytest.mark.skipif('os.environ.get("APPVEYOR")',
+    @pytest.mark.skipif(os.environ.get("APPVEYOR"),
         reason="https://github.com/pypa/setuptools/issues/851")
     def test_mixed_site_and_non_site(self, tmpdir):
         """