Merge branch 'remote_pypa_master' into feat/setupcfg_handling

5 files changed, 15 insertions, 7 deletions

diff --git a/.travis.yml b/.travis.yml
index 006316d1..30b69a69 100644
--- a/.travis.yml
+++ b/.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
diff --git a/CHANGES.rst b/CHANGES.rst
index 3b9f0894..99041cde 100644
--- a/CHANGES.rst
+++ b/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
 -------
 
diff --git a/setup.cfg b/setup.cfg
index 589df541..4e59c74e 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 29.0.0
+current_version = 29.0.1
 commit = True
 tag = True
 
diff --git a/setup.py b/setup.py
index 6286af63..79d30308 100755
--- a/setup.py
+++ b/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",
diff --git a/setuptools/tests/test_namespaces.py b/setuptools/tests/test_namespaces.py
index 21fd69e7..2d44ad86 100644
--- a/setuptools/tests/test_namespaces.py
+++ b/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):
         """