Skip to content

Commit a9ecd7e

Browse files
committed
Remove easy_install script and module.
1 parent 8222d6f commit a9ecd7e

4 files changed

Lines changed: 3 additions & 25 deletions

File tree

easy_install.py

Lines changed: 0 additions & 5 deletions
This file was deleted.

setup.cfg

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ project_urls =
2424

2525
[options]
2626
packages = find_namespace:
27-
py_modules = easy_install
2827
# disabled as it causes tests to be included #2505
2928
# include_package_data = true
3029
python_requires = >=3.6

setup.py

Lines changed: 0 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -30,22 +30,6 @@ def read_commands():
3030
return command_ns['__all__']
3131

3232

33-
def _gen_console_scripts():
34-
yield "easy_install = setuptools.command.easy_install:main"
35-
36-
# Gentoo distributions manage the python-version-specific scripts
37-
# themselves, so those platforms define an environment variable to
38-
# suppress the creation of the version-specific scripts.
39-
var_names = (
40-
'SETUPTOOLS_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT',
41-
'DISTRIBUTE_DISABLE_VERSIONED_EASY_INSTALL_SCRIPT',
42-
)
43-
if any(os.environ.get(var) not in (None, "", "0") for var in var_names):
44-
return
45-
tmpl = "easy_install-{shortver} = setuptools.command.easy_install:main"
46-
yield tmpl.format(shortver='{}.{}'.format(*sys.version_info))
47-
48-
4933
package_data = dict(
5034
setuptools=['script (dev).tmpl', 'script.tmpl', 'site-patch.py'],
5135
)
@@ -170,7 +154,6 @@ def _restore_install_lib(self):
170154
"depends.txt = setuptools.command.egg_info:warn_depends_obsolete",
171155
"dependency_links.txt = setuptools.command.egg_info:overwrite_arg",
172156
],
173-
"console_scripts": list(_gen_console_scripts()),
174157
"setuptools.installation":
175158
['eggsecutable = setuptools.command.easy_install:bootstrap'],
176159
},

setuptools/tests/test_namespaces.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,9 @@ def test_pkg_resources_import(self, tmpdir):
6262
target.mkdir()
6363
install_cmd = [
6464
sys.executable,
65-
'-m', 'easy_install',
66-
'-d', str(target),
65+
'-m', 'pip',
66+
'install',
67+
'-t', str(target),
6768
str(pkg),
6869
]
6970
with test.test.paths_on_pythonpath([str(target)]):

0 commit comments

Comments
 (0)