Skip to content

Commit

Permalink
drop easy_install script and associated documentation
Browse files Browse the repository at this point in the history
  • Loading branch information
benoit-pierre committed Nov 15, 2019
1 parent d6948c6 commit 6e1838a
Show file tree
Hide file tree
Showing 8 changed files with 21 additions and 1,184 deletions.
1,085 changes: 0 additions & 1,085 deletions docs/easy_install.txt

This file was deleted.

1 change: 0 additions & 1 deletion docs/index.txt
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,4 @@ Documentation content:
python3
development
roadmap
Deprecated: Easy Install <easy_install>
history
5 changes: 0 additions & 5 deletions easy_install.py

This file was deleted.

1 change: 0 additions & 1 deletion setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ classifiers =
[options]
zip_safe = True
python_requires = >=2.7,!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*
py_modules = easy_install
packages = find:

[options.packages.find]
Expand Down
19 changes: 0 additions & 19 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -31,22 +31,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'],
)
Expand Down Expand Up @@ -125,9 +109,6 @@ def pypi_link(pkg_filename):
"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'],
},
dependency_links=[
pypi_link(
Expand Down
55 changes: 1 addition & 54 deletions setuptools/command/easy_install.py
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@

__all__ = [
'samefile', 'easy_install', 'PthDistributions', 'extract_wininst_cfg',
'main', 'get_exe_prefixes',
'get_exe_prefixes',
]


Expand Down Expand Up @@ -2283,59 +2283,6 @@ def current_umask():
return tmp


def bootstrap():
# This function is called when setuptools*.egg is run using /bin/sh
import setuptools

argv0 = os.path.dirname(setuptools.__path__[0])
sys.argv[0] = argv0
sys.argv.append(argv0)
main()


def main(argv=None, **kw):
from setuptools import setup
from setuptools.dist import Distribution

class DistributionWithoutHelpCommands(Distribution):
common_usage = ""

def _show_help(self, *args, **kw):
with _patch_usage():
Distribution._show_help(self, *args, **kw)

if argv is None:
argv = sys.argv[1:]

with _patch_usage():
setup(
script_args=['-q', 'easy_install', '-v'] + argv,
script_name=sys.argv[0] or 'easy_install',
distclass=DistributionWithoutHelpCommands,
**kw
)


@contextlib.contextmanager
def _patch_usage():
import distutils.core
USAGE = textwrap.dedent("""
usage: %(script)s [options] requirement_or_url ...
or: %(script)s --help
""").lstrip()

def gen_usage(script_name):
return USAGE % dict(
script=os.path.basename(script_name),
)

saved = distutils.core.gen_usage
distutils.core.gen_usage = gen_usage
try:
yield
finally:
distutils.core.gen_usage = saved

class EasyInstallDeprecationWarning(SetuptoolsDeprecationWarning):
"""Class for warning about deprecations in EasyInstall in SetupTools. Not ignored by default, unlike DeprecationWarning."""

34 changes: 18 additions & 16 deletions setuptools/tests/test_easy_install.py
Original file line number Diff line number Diff line change
Expand Up @@ -467,22 +467,24 @@ def test_setup_requires_honors_fetch_params(self, mock_index, monkeypatch):
"""
monkeypatch.setenv(str('PIP_RETRIES'), str('0'))
monkeypatch.setenv(str('PIP_TIMEOUT'), str('0'))
with contexts.quiet():
# create an sdist that has a build-time dependency.
with TestSetupRequires.create_sdist() as dist_file:
with contexts.tempdir() as temp_install_dir:
with contexts.environment(PYTHONPATH=temp_install_dir):
ei_params = [
'--index-url', mock_index.url,
'--exclude-scripts',
'--install-dir', temp_install_dir,
dist_file,
]
with sandbox.save_argv(['easy_install']):
# attempt to install the dist. It should
# fail because it doesn't exist.
with pytest.raises(SystemExit):
easy_install_pkg.main(ei_params)
monkeypatch.setenv(str('PIP_VERBOSE'), str('1'))
# create an sdist that has a build-time dependency.
with TestSetupRequires.create_sdist() as dist_file:
with contexts.tempdir() as temp_dir:
setup_py = os.path.join(temp_dir, 'setup.py')
with open(setup_py, 'w') as fp:
fp.write('__import__("setuptools").setup()')
temp_install_dir = os.path.join(temp_dir, 'target')
os.mkdir(temp_install_dir)
with contexts.environment(PYTHONPATH=temp_install_dir):
# attempt to install the dist. It should
# fail because it doesn't exist.
with pytest.raises(SystemExit):
run_setup(setup_py, ['easy_install',
'--exclude-scripts',
'--index-url', mock_index.url,
'--install-dir', temp_install_dir,
dist_file])
# there should have been one requests to the server
assert [r.path for r in mock_index.requests] == ['/does-not-exist/']

Expand Down
5 changes: 2 additions & 3 deletions setuptools/tests/test_namespaces.py
Original file line number Diff line number Diff line change
Expand Up @@ -64,9 +64,8 @@ def test_pkg_resources_import(self, tmpdir):
target.mkdir()
install_cmd = [
sys.executable,
'-m', 'easy_install',
'-d', str(target),
str(pkg),
'-m', 'pip.__main__', 'install',
'-t', str(target), str(pkg),
]
with test.test.paths_on_pythonpath([str(target)]):
subprocess.check_call(install_cmd)
Expand Down

0 comments on commit 6e1838a

Please sign in to comment.