Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Rename the download-pex-bin scope to pex-cli. #14344

Merged
merged 1 commit into from Feb 3, 2022
Merged

Rename the download-pex-bin scope to pex-cli. #14344

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 10 additions & 7 deletions src/python/pants/backend/python/util_rules/pex_cli.py
View file
Open in desktop
Expand Up @@ -34,11 +34,14 @@
from pants.util.strutil import create_path_env_var


class PexBinary(TemplatedExternalTool):
options_scope = "download-pex-bin"
class PexCli(TemplatedExternalTool):
options_scope = "pex-cli"
name = "pex"
help = "The PEX (Python EXecutable) tool (https://github.com/pantsbuild/pex)."

deprecated_options_scope = "download-pex-bin"
deprecated_options_scope_removal_version = "2.11.0.dev0"

default_version = "v2.1.65"
default_url_template = "https://github.com/pantsbuild/pex/releases/download/{version}/pex"
version_constraints = ">=2.1.65,<3.0"
Expand Down Expand Up @@ -114,17 +117,17 @@ class PexPEX(DownloadedExternalTool):


@rule
async def download_pex_pex(pex_binary: PexBinary) -> PexPEX:
async def download_pex_pex(pex_cli: PexCli) -> PexPEX:
pex_pex = await Get(
DownloadedExternalTool, ExternalToolRequest, pex_binary.get_request(Platform.current)
DownloadedExternalTool, ExternalToolRequest, pex_cli.get_request(Platform.current)
)
return PexPEX(digest=pex_pex.digest, exe=pex_pex.exe)


@rule
async def setup_pex_cli_process(
request: PexCliProcess,
pex_binary: PexPEX,
pex_pex: PexPEX,
pex_env: PexEnvironment,
python_native_code: PythonNativeCode,
global_options: GlobalOptions,
Expand All @@ -148,7 +151,7 @@ async def setup_pex_cli_process(
)
cert_args = ["--cert", chrooted_ca_certs_path]

digests_to_merge = [pex_binary.digest]
digests_to_merge = [pex_pex.digest]
digests_to_merge.extend(await MultiGet(gets))
if request.additional_input_digest:
digests_to_merge.append(request.additional_input_digest)
Expand Down Expand Up @@ -189,7 +192,7 @@ async def setup_pex_cli_process(
]

complete_pex_env = pex_env.in_sandbox(working_directory=None)
normalized_argv = complete_pex_env.create_argv(pex_binary.exe, *args, python=request.python)
normalized_argv = complete_pex_env.create_argv(pex_pex.exe, *args, python=request.python)
env = {
**complete_pex_env.environment_dict(python_configured=request.python is not None),
**python_native_code.environment_dict,
Expand Down