diff options
author | Jason R. Coombs <jaraco@jaraco.com> | 2020-06-15 17:19:42 -0400 |
---|---|---|
committer | Jason R. Coombs <jaraco@jaraco.com> | 2020-06-15 17:19:42 -0400 |
commit | b88c8849a58346700eccdf3b44aa6b57a4b6ebcf (patch) | |
tree | 8c019fa46747d500e463a4d76ffe029367740297 /setuptools/command/easy_install.py | |
parent | 3955acbb0da75df804d86a52d6fbcc269075a9d3 (diff) | |
download | python-setuptools-git-feature/simple-dist-name-in-scripts.tar.gz |
Avoid the full spec and only rely on the dist name when generating script wrappers.feature/simple-dist-name-in-scripts
Diffstat (limited to 'setuptools/command/easy_install.py')
-rw-r--r-- | setuptools/command/easy_install.py | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/setuptools/command/easy_install.py b/setuptools/command/easy_install.py index 81526b9a..5d39ff16 100644 --- a/setuptools/command/easy_install.py +++ b/setuptools/command/easy_install.py @@ -2071,7 +2071,7 @@ class ScriptWriter: """ template = textwrap.dedent(r""" - # EASY-INSTALL-ENTRY-SCRIPT: %(spec)r,%(group)r,%(name)r + # EASY-INSTALL-ENTRY-SCRIPT: %(dist_name)r,%(group)r,%(name)r import re import sys @@ -2084,8 +2084,7 @@ class ScriptWriter: from pkg_resources import load_entry_point - def importlib_load_entry_point(spec, group, name): - dist_name, _, _ = spec.partition('==') + def importlib_load_entry_point(dist_name, group, name): matches = ( entry_point for entry_point in distribution(dist_name).entry_points @@ -2099,7 +2098,7 @@ class ScriptWriter: if __name__ == '__main__': sys.argv[0] = re.sub(r'(-script\.pyw?|\.exe)?$', '', sys.argv[0]) - sys.exit(load_entry_point(%(spec)r, %(group)r, %(name)r)()) + sys.exit(load_entry_point(%(dist_name)r, %(group)r, %(name)r)()) """).lstrip() command_spec_class = CommandSpec @@ -2129,7 +2128,7 @@ class ScriptWriter: """ if header is None: header = cls.get_header() - spec = str(dist.as_requirement()) + dist_name = dist.project_name for type_ in 'console', 'gui': group = type_ + '_scripts' for name, ep in dist.get_entry_map(group).items(): |