From ae4e916fc63d0dc05b5d98acfdb16e45ce82d7c1 Mon Sep 17 00:00:00 2001 From: John Sirois Date: Tue, 2 Mar 2021 10:13:22 -0800 Subject: [PATCH] Fix two more missed ~str(...). # Rust tests and lints will be skipped. Delete if not intended. [ci skip-rust] # Building wheels and fs_util will be skipped. Delete if not intended. [ci skip-build-wheels] --- src/python/pants/backend/python/goals/setup_py.py | 3 ++- src/python/pants/backend/python/target_types_rules.py | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/python/pants/backend/python/goals/setup_py.py b/src/python/pants/backend/python/goals/setup_py.py index b1293b55451..41bc4850726 100644 --- a/src/python/pants/backend/python/goals/setup_py.py +++ b/src/python/pants/backend/python/goals/setup_py.py @@ -550,7 +550,8 @@ async def generate_chroot(request: SetupPyChrootRequest) -> SetupPyChroot: for key, binary_entry_point in zip(key_to_binary_spec.keys(), binary_entry_points): entry_points = setup_kwargs.setdefault("entry_points", {}) console_scripts = entry_points.setdefault("console_scripts", []) - console_scripts.append(f"{key}={binary_entry_point.val}") + if binary_entry_point.val is not None: + console_scripts.append(f"{key}={binary_entry_point.val.spec}") # Generate the setup script. setup_py_content = SETUP_BOILERPLATE.format( diff --git a/src/python/pants/backend/python/target_types_rules.py b/src/python/pants/backend/python/target_types_rules.py index 37172a539a0..00a2a852c89 100644 --- a/src/python/pants/backend/python/target_types_rules.py +++ b/src/python/pants/backend/python/target_types_rules.py @@ -86,7 +86,7 @@ async def resolve_pex_entry_point(request: ResolvePexEntryPointRequest) -> Resol # we need to check if they used a file glob (`*` or `**`) that resolved to >1 file. if len(entry_point_paths.files) != 1: raise InvalidFieldException( - f"Multiple files matched for the `{ep_alias}` {repr(ep_val)} for the target " + f"Multiple files matched for the `{ep_alias}` {ep_val.spec!r} for the target " f"{address}, but only one file expected. Are you using a glob, rather than a file " f"name?\n\nAll matching files: {list(entry_point_paths.files)}." )