aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2016-11-26 21:24:11 -0600
committerJason R. Coombs <jaraco@jaraco.com>2016-11-26 21:27:44 -0600
commitde11b125f7a94a13aff478482e3a83a30176f7b7 (patch)
tree263437314ea734cafaa46d71ff0d0b95598d4e5c
parent175171116dc40af5274c88ec461dd2e94c1dabc5 (diff)
downloadexternal_python_setuptools-de11b125f7a94a13aff478482e3a83a30176f7b7.tar.gz
external_python_setuptools-de11b125f7a94a13aff478482e3a83a30176f7b7.tar.bz2
external_python_setuptools-de11b125f7a94a13aff478482e3a83a30176f7b7.zip
Now by default include the windows script launchers. Fixes #861 by addressing the underlying cause.
-rw-r--r--.travis.yml2
-rw-r--r--CHANGES.rst10
-rwxr-xr-xsetup.py4
3 files changed, 12 insertions, 4 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.py b/setup.py
index 6286af63..30c19d66 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 = (