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

Have lambdex create a new output file. (Cherry-pick of #18200) #18201

Merged
merged 1 commit into from
Feb 8, 2023
Merged

Have lambdex create a new output file. (Cherry-pick of #18200) #18201

Show file tree
Hide file tree
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.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/python/pants/backend/awslambda/python/rules.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,8 @@ async def package_python_awslambda(
)
)

output_filename = field_set.output_path.value_or_default(
# Lambdas typically use the .zip suffix, so we use that instead of .pex.
file_ending="zip",
)
# Lambdas typically use the .zip suffix.
output_filename = field_set.output_path.value_or_default(file_ending="zip")

# We hardcode the platform value to the appropriate one for each AWS Lambda runtime.
# (Running the "hello world" lambda in the example code will report the platform, and can be
Expand Down Expand Up @@ -115,11 +113,12 @@ async def package_python_awslambda(
CompletePlatforms, PexCompletePlatformsField, field_set.complete_platforms
)

pex_filename = f"{output_filename}.pex"
pex_request = PexFromTargetsRequest(
addresses=[field_set.address],
internal_only=False,
include_requirements=field_set.include_requirements.value,
output_filename=output_filename,
output_filename=pex_filename,
platforms=PexPlatforms(pex_platforms),
complete_platforms=complete_platforms,
additional_args=additional_pex_args,
Expand Down Expand Up @@ -155,12 +154,13 @@ async def package_python_awslambda(
)
)

# NB: Lambdex modifies its input pex in-place, so the input file is also the output file.
# NB: Lambdex can modify its input pex in-place, but the REAPI doesn't support that,
# so we provide it with an explicit `-o` option to write to a new file.
result = await Get(
ProcessResult,
VenvPexProcess(
lambdex_pex,
argv=("build", "-e", handler.val, output_filename),
argv=("build", "-e", handler.val, "-o", output_filename, pex_filename),
input_digest=pex_result.digest,
output_files=(output_filename,),
description=f"Setting up handler in {output_filename}",
Expand Down
21 changes: 11 additions & 10 deletions src/python/pants/backend/python/subsystems/lambdex.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
// "CPython<3.10,>=3.7"
// ],
// "generated_with_requirements": [
// "lambdex==0.1.6"
// "lambdex==0.1.8"
// ],
// "manylinux": "manylinux2014",
// "requirement_constraints": [],
Expand All @@ -31,23 +31,24 @@
"artifacts": [
{
"algorithm": "sha256",
"hash": "cb685b106617fbd1afd26d6e9472b2e0c99df8574c6d358aee4e6c13aeef8eb1",
"url": "https://files.pythonhosted.org/packages/27/1c/2bdf24103d594d707d1a7dc8173980005074cb1b57558ed8f57b966a9ad5/lambdex-0.1.6-py2.py3-none-any.whl"
"hash": "38bb16c0b3322b84e18062468344475c65bc0a79693727477477576c229aeefb",
"url": "https://files.pythonhosted.org/packages/ec/aa/e265e9b42db08d85e36b84428b3118a702f8bbc3c6bbde96ac363bf927fa/lambdex-0.1.8-py2.py3-none-any.whl"
},
{
"algorithm": "sha256",
"hash": "6d1a95c8a31baa703edece8e36a705045b0203c7e886812c27a4dd945aa694e0",
"url": "https://files.pythonhosted.org/packages/18/bf/6f6ea14d4cc7f5a94367b2e55ae973a0b6737ed113d7dc9add983d5956de/lambdex-0.1.6.tar.gz"
"hash": "f2f542b3e0cea7ac49ff6472dafd8330b7883de6f62438c23e1fc986e9cc4f27",
"url": "https://files.pythonhosted.org/packages/ef/81/87dcfe5534096ae67bd92ad5deefa00b761d95e54b21d879fe3624ed74c4/lambdex-0.1.8.tar.gz"
}
],
"project_name": "lambdex",
"requires_dists": [
"flask<2; extra == \"test-gcp-http\" and python_version < \"3.6\"",
"flask~=2.0.0; extra == \"test-gcp-http\" and python_version >= \"3.6\"",
"flask==1.1.4; extra == \"test-gcp-http\" and python_version < \"3.6\"",
"flask==2.0.3; extra == \"test-gcp-http\" and (python_version >= \"3.6\" and python_version < \"3.7\")",
"flask==2.2.2; extra == \"test-gcp-http\" and python_version >= \"3.7\"",
"pex>=1.1.15"
],
"requires_python": "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,<3.10,>=2.7",
"version": "0.1.6"
"requires_python": "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,!=3.4.*,!=3.5.*,<3.12,>=2.7",
"version": "0.1.8"
},
{
"artifacts": [
Expand Down Expand Up @@ -78,7 +79,7 @@
"pip_version": "20.3.4-patched",
"prefer_older_binary": false,
"requirements": [
"lambdex==0.1.6"
"lambdex==0.1.8"
],
"requires_python": [
"<3.10,>=3.7"
Expand Down
2 changes: 1 addition & 1 deletion src/python/pants/backend/python/subsystems/lambdex.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ class Lambdex(PythonToolBase):
options_scope = "lambdex"
help = "A tool for turning .pex files into Function-as-a-Service artifacts (https://github.com/pantsbuild/lambdex)."

default_version = "lambdex==0.1.6"
default_version = "lambdex==0.1.8"
default_main = ConsoleScript("lambdex")

register_interpreter_constraints = True
Expand Down