From 6d6dddc57e58e2387930040dfb56dd270408cb24 Mon Sep 17 00:00:00 2001 From: Arfrever Frehtes Taifersar Arahesis Date: Thu, 20 Jun 2013 10:03:23 +0200 Subject: Add support for SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT variable. Support for old DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT variable is kept temporarily for backward compatibility. --HG-- extra : source : eb58c3fe7c0881cbb28de1c523f083ad8e7f427d --- setup.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index 8986e949..fcf61e75 100755 --- a/setup.py +++ b/setup.py @@ -55,7 +55,8 @@ from setuptools.command.test import test as _test scripts = [] console_scripts = ["easy_install = setuptools.command.easy_install:main"] -if os.environ.get("DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT") is None: +if os.environ.get("SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT") in (None, "", "0") and \ + os.environ.get("DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT") in (None, "", "0"): console_scripts.append("easy_install-%s = setuptools.command.easy_install:main" % sys.version[:3]) # specific command that is used to generate windows .exe files -- cgit v1.2.3 From f5a609f696a9fdc85cefd09f97865282fa341631 Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sat, 29 Jun 2013 10:47:03 -0400 Subject: Add comment to capture the purpose of the environment variable --- setup.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'setup.py') diff --git a/setup.py b/setup.py index fcf61e75..cb0ce012 100755 --- a/setup.py +++ b/setup.py @@ -55,6 +55,10 @@ from setuptools.command.test import test as _test scripts = [] console_scripts = ["easy_install = setuptools.command.easy_install:main"] + +# Gentoo distributions manage the python-version-specific scripts themselves, +# so they define an environment variable to suppress the creation of the +# version-specific scripts. if os.environ.get("SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT") in (None, "", "0") and \ os.environ.get("DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT") in (None, "", "0"): console_scripts.append("easy_install-%s = setuptools.command.easy_install:main" % sys.version[:3]) -- cgit v1.2.3 From b99749aa06cc7c235cb456a81ad50187d701fc4c Mon Sep 17 00:00:00 2001 From: "Jason R. Coombs" Date: Sat, 29 Jun 2013 10:54:10 -0400 Subject: Bumped to 0.7.6 in preparation for next release. --- setup.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'setup.py') diff --git a/setup.py b/setup.py index cb0ce012..f2bd1fd5 100755 --- a/setup.py +++ b/setup.py @@ -46,7 +46,7 @@ exec(init_file.read(), d) init_file.close() SETUP_COMMANDS = d['__all__'] -VERSION = "0.7.5" +VERSION = "0.7.6" from setuptools import setup, find_packages from setuptools.command.build_py import build_py as _build_py -- cgit v1.2.3