summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2021-01-20 21:02:24 -0500
committerJason R. Coombs <jaraco@jaraco.com>2021-01-20 21:02:24 -0500
commita9ecd7efb38fac3fbbcb6a55feeff10f45793027 (patch)
tree646a63d24354ab17ca71bea038d869fedb49d114
parent8222d6f7b992d3b184434acb31cd66b0f2e41401 (diff)
downloadpython-setuptools-git-feature/remove-easy-install.tar.gz
Remove easy_install script and module.feature/remove-easy-install
-rw-r--r--easy_install.py5
-rw-r--r--setup.cfg1
-rwxr-xr-xsetup.py17
-rw-r--r--setuptools/tests/test_namespaces.py5
4 files changed, 3 insertions, 25 deletions
diff --git a/easy_install.py b/easy_install.py
deleted file mode 100644
index d87e9840..00000000
--- a/easy_install.py
+++ /dev/null
@@ -1,5 +0,0 @@
-"""Run the EasyInstall command"""
-
-if __name__ == '__main__':
- from setuptools.command.easy_install import main
- main()
diff --git a/setup.cfg b/setup.cfg
index 36c7daee..006851da 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -24,7 +24,6 @@ project_urls =
[options]
packages = find_namespace:
-py_modules = easy_install
# disabled as it causes tests to be included #2505
# include_package_data = true
python_requires = >=3.6
diff --git a/setup.py b/setup.py
index 28d3dada..866383bd 100755
--- a/setup.py
+++ b/setup.py
@@ -30,22 +30,6 @@ def read_commands():
return command_ns['__all__']
-def _gen_console_scripts():
- yield "easy_install = setuptools.command.easy_install:main"
-
- # Gentoo distributions manage the python-version-specific scripts
- # themselves, so those platforms define an environment variable to
- # suppress the creation of the version-specific scripts.
- var_names = (
- 'SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT',
- 'DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT',
- )
- if any(os.environ.get(var) not in (None, "", "0") for var in var_names):
- return
- tmpl = "easy_install-{shortver} = setuptools.command.easy_install:main"
- yield tmpl.format(shortver='{}.{}'.format(*sys.version_info))
-
-
package_data = dict(
setuptools=['script (dev).tmpl', 'script.tmpl', 'site-patch.py'],
)
@@ -170,7 +154,6 @@ setup_params = dict(
"depends.txt = setuptools.command.egg_info:warn_depends_obsolete",
"dependency_links.txt = setuptools.command.egg_info:overwrite_arg",
],
- "console_scripts": list(_gen_console_scripts()),
"setuptools.installation":
['eggsecutable = setuptools.command.easy_install:bootstrap'],
},
diff --git a/setuptools/tests/test_namespaces.py b/setuptools/tests/test_namespaces.py
index 6c8c522d..270f90c9 100644
--- a/setuptools/tests/test_namespaces.py
+++ b/setuptools/tests/test_namespaces.py
@@ -62,8 +62,9 @@ class TestNamespaces:
target.mkdir()
install_cmd = [
sys.executable,
- '-m', 'easy_install',
- '-d', str(target),
+ '-m', 'pip',
+ 'install',
+ '-t', str(target),
str(pkg),
]
with test.test.paths_on_pythonpath([str(target)]):