aws-lambda-builders 1.69.0__tar.gz → 1.70.0__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {aws_lambda_builders-1.69.0/aws_lambda_builders.egg-info → aws_lambda_builders-1.70.0}/PKG-INFO +4 -2
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/__init__.py +1 -1
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/python_uv/DESIGN.md +92 -8
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/python_uv/actions.py +2 -2
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/python_uv/packager.py +272 -24
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/python_uv/utils.py +74 -19
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/python_uv/workflow.py +55 -3
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0/aws_lambda_builders.egg-info}/PKG-INFO +4 -2
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders.egg-info/requires.txt +7 -1
- aws_lambda_builders-1.70.0/requirements/base.txt +1 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/requirements/dev.txt +2 -1
- aws_lambda_builders-1.69.0/requirements/base.txt +0 -1
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/LICENSE +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/MANIFEST.in +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/NOTICE +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/README.md +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/__main__.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/actions.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/architecture.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/binary_path.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/builder.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/exceptions.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/path_resolver.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/registry.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/supported_runtimes.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/utils.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/validator.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflow.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/__init__.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/custom_make/DESIGN.md +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/custom_make/__init__.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/custom_make/actions.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/custom_make/exceptions.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/custom_make/make.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/custom_make/utils.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/custom_make/validator.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/custom_make/workflow.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/dotnet_clipackage/DESIGN.md +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/dotnet_clipackage/__init__.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/dotnet_clipackage/actions.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/dotnet_clipackage/dotnetcli.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/dotnet_clipackage/dotnetcli_resolver.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/dotnet_clipackage/utils.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/dotnet_clipackage/workflow.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/go_modules/DESIGN.md +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/go_modules/__init__.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/go_modules/actions.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/go_modules/builder.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/go_modules/utils.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/go_modules/validator.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/go_modules/workflow.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/java/__init__.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/java/actions.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/java/utils.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/java_gradle/DESIGN.md +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/java_gradle/__init__.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/java_gradle/actions.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/java_gradle/gradle.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/java_gradle/gradle_resolver.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/java_gradle/gradle_validator.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/java_gradle/resources/lambda-build-init.gradle +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/java_gradle/workflow.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/java_maven/DESIGN.md +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/java_maven/__init__.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/java_maven/actions.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/java_maven/maven.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/java_maven/maven_resolver.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/java_maven/maven_validator.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/java_maven/workflow.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/nodejs_npm/DESIGN.md +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/nodejs_npm/__init__.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/nodejs_npm/actions.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/nodejs_npm/exceptions.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/nodejs_npm/lockfile_closure.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/nodejs_npm/npm.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/nodejs_npm/utils.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/nodejs_npm/workflow.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/nodejs_npm_esbuild/DESIGN.md +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/nodejs_npm_esbuild/__init__.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/nodejs_npm_esbuild/actions.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/nodejs_npm_esbuild/esbuild.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/nodejs_npm_esbuild/exceptions.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/nodejs_npm_esbuild/workflow.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/python_pip/DESIGN.md +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/python_pip/__init__.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/python_pip/actions.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/python_pip/compat.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/python_pip/exceptions.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/python_pip/packager.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/python_pip/utils.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/python_pip/validator.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/python_pip/workflow.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/python_uv/__init__.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/python_uv/exceptions.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/ruby_bundler/DESIGN.md +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/ruby_bundler/__init__.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/ruby_bundler/actions.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/ruby_bundler/bundler.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/ruby_bundler/utils.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/ruby_bundler/workflow.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/rust_cargo/DESIGN.md +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/rust_cargo/__init__.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/rust_cargo/actions.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/rust_cargo/cargo_lambda.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/rust_cargo/exceptions.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/rust_cargo/utils.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders/workflows/rust_cargo/workflow.py +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders.egg-info/SOURCES.txt +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders.egg-info/dependency_links.txt +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders.egg-info/entry_points.txt +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/aws_lambda_builders.egg-info/top_level.txt +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/pyproject.toml +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/requirements/python_pip.txt +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/setup.cfg +0 -0
- {aws_lambda_builders-1.69.0 → aws_lambda_builders-1.70.0}/setup.py +0 -0
{aws_lambda_builders-1.69.0/aws_lambda_builders.egg-info → aws_lambda_builders-1.70.0}/PKG-INFO
RENAMED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.4
|
|
2
2
|
Name: aws_lambda_builders
|
|
3
|
-
Version: 1.
|
|
3
|
+
Version: 1.70.0
|
|
4
4
|
Summary: Python library to compile, build & package AWS Lambda functions for several runtimes & frameworks.
|
|
5
5
|
Home-page: https://github.com/awslabs/aws-lambda-builders
|
|
6
6
|
Author: Amazon Web Services
|
|
@@ -27,16 +27,18 @@ Classifier: Topic :: Utilities
|
|
|
27
27
|
Requires-Python: >=3.10
|
|
28
28
|
License-File: LICENSE
|
|
29
29
|
License-File: NOTICE
|
|
30
|
+
Requires-Dist: tomli>=1.1.0; python_version < "3.11"
|
|
30
31
|
Requires-Dist: setuptools
|
|
31
32
|
Requires-Dist: wheel
|
|
32
33
|
Provides-Extra: dev
|
|
33
34
|
Requires-Dist: coverage==7.15.1; extra == "dev"
|
|
34
35
|
Requires-Dist: flake8==3.8.4; extra == "dev"
|
|
35
36
|
Requires-Dist: pytest-cov==6.3.0; extra == "dev"
|
|
37
|
+
Requires-Dist: tomli>=1.1.0; python_version < "3.11" and extra == "dev"
|
|
36
38
|
Requires-Dist: pytest>=9.1.1; extra == "dev"
|
|
37
39
|
Requires-Dist: parameterized==0.9.0; extra == "dev"
|
|
38
40
|
Requires-Dist: pyelftools~=0.33; extra == "dev"
|
|
39
|
-
Requires-Dist: black==26.
|
|
41
|
+
Requires-Dist: black==26.10.1; extra == "dev"
|
|
40
42
|
Requires-Dist: ruff==0.16.5; extra == "dev"
|
|
41
43
|
Dynamic: author
|
|
42
44
|
Dynamic: author-email
|
|
@@ -115,8 +115,8 @@ The workflow uses a smart dispatch system that recognizes actual manifest files:
|
|
|
115
115
|
|
|
116
116
|
**Smart Lock File Detection:**
|
|
117
117
|
- Look for requirements.txt first
|
|
118
|
-
- When `pyproject.toml` is the manifest,
|
|
119
|
-
- If `uv.lock` exists
|
|
118
|
+
- When `pyproject.toml` is the manifest, resolves the workspace root (the project directory for standalone projects) and checks for `uv.lock` there
|
|
119
|
+
- If `uv.lock` exists at that root, uses lock-based build for precise dependencies
|
|
120
120
|
- If no `uv.lock`, uses standard pyproject.toml build with UV's lock and export workflow
|
|
121
121
|
|
|
122
122
|
**Important:** `uv.lock` is NOT a standalone manifest - it's a lock file that enhances `pyproject.toml` builds when present.
|
|
@@ -125,6 +125,13 @@ The workflow uses a smart dispatch system that recognizes actual manifest files:
|
|
|
125
125
|
|
|
126
126
|
**For pyproject.toml with uv.lock present:**
|
|
127
127
|
- Use `uv export` to convert lock file to requirements.txt format
|
|
128
|
+
- Export with `--locked`, reusing the lock's resolution mode, prerelease mode, fork strategy, and `exclude-newer`
|
|
129
|
+
cutoff so export validates rather than rewrites the existing lock. Stale locks fail the build;
|
|
130
|
+
run `uv lock` explicitly after dependency changes.
|
|
131
|
+
- For relative cutoffs, replay `exclude-newer-span` instead of the lock's placeholder `exclude-newer` date.
|
|
132
|
+
Python 3.10 uses the runtime dependency `tomli` to read lock options; Python 3.11+ uses `tomllib`.
|
|
133
|
+
- Replay each `options.exclude-newer-package` entry with `--exclude-newer-package`, preferring its `span`
|
|
134
|
+
over the placeholder `timestamp` for relative per-package cutoffs.
|
|
128
135
|
- Install using `uv pip install` with platform targeting (--python-platform)
|
|
129
136
|
- Provides reproducible builds with locked dependency versions AND cross-platform support
|
|
130
137
|
|
|
@@ -145,7 +152,9 @@ the `--python-platform` flag for cross-platform wheel selection.
|
|
|
145
152
|
#### Step 3: Configure Lambda-compatible installation
|
|
146
153
|
|
|
147
154
|
UV is configured with Lambda-specific settings:
|
|
148
|
-
- Target platform:
|
|
155
|
+
- Target platform: explicit manylinux targets, independent of the build host's glibc.
|
|
156
|
+
Python 3.8-3.11 use `manylinux_2_17` (the AL2-compatible download target used by the pip workflow);
|
|
157
|
+
Python 3.12+ use `manylinux_2_34` for Amazon Linux 2023.
|
|
149
158
|
- Target architecture: `x86_64` or `aarch64`
|
|
150
159
|
- Python version matching Lambda runtime
|
|
151
160
|
- Prefer wheels over source distributions for faster builds
|
|
@@ -211,6 +220,39 @@ config = {
|
|
|
211
220
|
}
|
|
212
221
|
```
|
|
213
222
|
|
|
223
|
+
### Build options
|
|
224
|
+
|
|
225
|
+
`PythonUvWorkflow` reads these keys from the workflow `options` and passes them to `uv export`.
|
|
226
|
+
SAM CLI maps them from `Metadata.BuildProperties`.
|
|
227
|
+
|
|
228
|
+
| Option | SAM CLI property | Type | `uv export` effect |
|
|
229
|
+
|---|---|---|---|
|
|
230
|
+
| `uv_groups` | `UvGroups` | list of str | `--group <name>` per entry |
|
|
231
|
+
| `uv_extras` | `UvExtras` | list of str | `--extra <name>` per entry |
|
|
232
|
+
| `uv_all_extras` | `UvAllExtras` | bool | `--all-extras` |
|
|
233
|
+
| `uv_prune` | `UvPrune` | list of str | `--prune <name>` per entry: drops the package and any dependency only it needs |
|
|
234
|
+
|
|
235
|
+
Default groups stay excluded (`--no-default-groups`); `uv_groups` adds groups on top of that.
|
|
236
|
+
`uv_prune` is meant for packages the Lambda runtime already ships, such as `boto3`. The function then
|
|
237
|
+
uses the runtime's version, which AWS picks, not the version in `uv.lock`.
|
|
238
|
+
The build fails with a clear message, instead of ignoring the option, when:
|
|
239
|
+
- a value has the wrong type, or an unknown `uv_*` key is given;
|
|
240
|
+
- `uv_extras` and `uv_all_extras` are combined;
|
|
241
|
+
- an option is set on a `requirements.txt` build (they apply only to pyproject.toml / uv.lock projects);
|
|
242
|
+
- a `uv_prune` name is not a package in `uv.lock`, which `uv export --prune` would otherwise ignore.
|
|
243
|
+
|
|
244
|
+
### Settings from pyproject.toml
|
|
245
|
+
|
|
246
|
+
The workflow runs `uv export` and `uv pip install` from the project, so uv reads its own settings there.
|
|
247
|
+
Build-control settings in `[tool.uv]` (`no-build`, `no-build-package`, `no-binary`, `no-binary-package`) apply
|
|
248
|
+
to both steps; `[tool.uv.pip]` settings (`no-build`, `no-binary`, `only-binary`) apply to the install. `UV_*`
|
|
249
|
+
environment variables apply to every uv call. The workflow's own flags always win: the target platform and
|
|
250
|
+
Python version come from the function's architecture and runtime, default groups are excluded, and nothing
|
|
251
|
+
is installed editable. In a uv workspace only the workspace root's `pyproject.toml` settings are used; a
|
|
252
|
+
member's `[tool.uv]` and `[tool.uv.pip]` tables are ignored. An unknown key in either table makes uv ignore
|
|
253
|
+
every setting in that file. The build log shows uv's warning about it (the workflow logs every `warning:`
|
|
254
|
+
that uv prints, once per build), so check the key names against uv's settings reference.
|
|
255
|
+
|
|
214
256
|
### Caching
|
|
215
257
|
|
|
216
258
|
The workflow does not pass `--cache-dir` unless a caller supplies one, so UV uses its own
|
|
@@ -224,6 +266,11 @@ and across successive builds. Pointing UV at the build's scratch directory inste
|
|
|
224
266
|
discard the cache every time, because that directory is deleted when the build finishes — every
|
|
225
267
|
function would then re-download its entire dependency set on every build.
|
|
226
268
|
|
|
269
|
+
The one exception is a default cache location that can't be created, such as `/.cache/uv` for a
|
|
270
|
+
container build run as a host uid with no home directory (`sam build --use-container
|
|
271
|
+
--mount-with WRITE`). Then the build uses `uv-cache` under the scratch directory and logs a
|
|
272
|
+
warning. Nothing is lost there, because such a container starts with an empty cache anyway.
|
|
273
|
+
|
|
227
274
|
### Compatibility with Existing Workflows
|
|
228
275
|
|
|
229
276
|
The UV workflow is designed to be a drop-in replacement for the pip workflow:
|
|
@@ -271,13 +318,17 @@ CAPABILITY = Capability(
|
|
|
271
318
|
|
|
272
319
|
The workflow uses intelligent manifest detection:
|
|
273
320
|
|
|
274
|
-
**
|
|
275
|
-
1. `
|
|
276
|
-
2. `requirements
|
|
277
|
-
3. `pyproject.toml`
|
|
321
|
+
**Auto-detection (when no manifest path is given), in order of preference:**
|
|
322
|
+
1. `pyproject.toml`, when it is the uv project: a `uv.lock` sits beside it, or its `[project]` table declares a non-empty `dependencies` list
|
|
323
|
+
2. `requirements.txt`, then `requirements-prod.txt`
|
|
324
|
+
3. `pyproject.toml` otherwise (metadata or tool settings only, empty `dependencies`, or `dynamic` dependencies)
|
|
325
|
+
|
|
326
|
+
`requirements-dev.txt` and `requirements-test.txt` are never auto-detected: development and test dependencies do not belong in a Lambda package. They can still be passed as an explicit manifest path.
|
|
327
|
+
|
|
328
|
+
On Python 3.10 without `tomli`, declared dependencies cannot be read, so only a `uv.lock` makes `pyproject.toml` win over a requirements file.
|
|
278
329
|
|
|
279
330
|
**Smart Lock File Enhancement:**
|
|
280
|
-
- When `pyproject.toml` is used, automatically detects `uv.lock`
|
|
331
|
+
- When `pyproject.toml` is used, automatically detects `uv.lock` at the resolved workspace or project root
|
|
281
332
|
- If `uv.lock` exists, uses lock-based build for reproducible dependencies
|
|
282
333
|
- If no `uv.lock`, uses standard pyproject.toml workflow with UV's lock and export
|
|
283
334
|
|
|
@@ -304,6 +355,39 @@ Note: `requirements.in` (pip-tools format) is not supported to keep the implemen
|
|
|
304
355
|
- **UvBuildError**: Package build failures
|
|
305
356
|
- **LockFileError**: Lock file parsing or validation errors
|
|
306
357
|
|
|
358
|
+
#### Workspace Resolution Failure Policy
|
|
359
|
+
|
|
360
|
+
Workspace discovery runs before the lock-file lookup for every `pyproject.toml` build.
|
|
361
|
+
The compatibility fallback to the project directory is deliberately limited to two cases:
|
|
362
|
+
|
|
363
|
+
- A plain `X.Y.Z` UV version is numerically below `0.9.9`; the workspace command is not invoked.
|
|
364
|
+
- The workspace command exits unsuccessfully and stderr contains `unrecognized subcommand 'workspace'`.
|
|
365
|
+
|
|
366
|
+
Both cases log at DEBUG. They additionally emit a WARNING only if a `pyproject.toml`
|
|
367
|
+
in the project directory or an ancestor contains a `tool.uv.workspace` table. This is
|
|
368
|
+
only a diagnostic hint: `members` and `exclude` are not evaluated, so the warning does
|
|
369
|
+
not assert membership or change the chosen root or build path. Unreadable or invalid
|
|
370
|
+
TOML is logged at DEBUG and skipped. The helper lazily imports `tomllib`, or optional
|
|
371
|
+
`tomli` on Python 3.10. If neither is available, it logs at DEBUG and skips configuration
|
|
372
|
+
inspection; no TOML parser is required to build dependencies.
|
|
373
|
+
This preserves the previous behavior for standalone projects
|
|
374
|
+
using unsupported UV versions; it does not provide workspace support for those versions.
|
|
375
|
+
Unknown or prerelease version strings are tested by invoking the workspace command rather
|
|
376
|
+
than assuming support or lack of support.
|
|
377
|
+
|
|
378
|
+
All other command failures raise `UvBuildError` with the diagnostic, and a successful exit
|
|
379
|
+
with empty or whitespace-only output also raises because it supplies no root directory.
|
|
380
|
+
These outcomes do not establish that the project is outside a workspace. Falling back could
|
|
381
|
+
miss an existing workspace-root lock, trigger lock generation, or resolve local dependencies
|
|
382
|
+
from the wrong directory.
|
|
383
|
+
|
|
384
|
+
This intentionally favors stopping on uncertain workspace discovery over continuing a
|
|
385
|
+
potentially incorrect build. Consequently, a standalone project that previously built may
|
|
386
|
+
now stop if workspace discovery fails for an unknown reason. That compatibility limitation
|
|
387
|
+
is accepted rather than treating permission, configuration, or process-start failures as
|
|
388
|
+
evidence that the workspace command is unsupported. The original diagnostic is surfaced
|
|
389
|
+
instead of recommending an upgrade for an unknown cause.
|
|
390
|
+
|
|
307
391
|
#### Platform Compatibility Matrix
|
|
308
392
|
| Python Version | x86_64 | arm64 | Status |
|
|
309
393
|
|---------------|--------|-------|---------|
|
|
@@ -8,7 +8,7 @@ from typing import Optional
|
|
|
8
8
|
from aws_lambda_builders.actions import ActionFailedError, BaseAction, Purpose
|
|
9
9
|
from aws_lambda_builders.architecture import X86_64
|
|
10
10
|
|
|
11
|
-
from .exceptions import MissingUvError, UvBuildError, UvInstallationError
|
|
11
|
+
from .exceptions import LockFileError, MissingUvError, UvBuildError, UvInstallationError
|
|
12
12
|
from .packager import PythonUvDependencyBuilder, SubprocessUv, UvRunner
|
|
13
13
|
from .utils import OSUtils, UvConfig
|
|
14
14
|
|
|
@@ -72,5 +72,5 @@ class PythonUvBuildAction(BaseAction):
|
|
|
72
72
|
architecture=self.architecture,
|
|
73
73
|
config=self.config,
|
|
74
74
|
)
|
|
75
|
-
except (MissingUvError, UvInstallationError, UvBuildError) as ex:
|
|
75
|
+
except (LockFileError, MissingUvError, UvInstallationError, UvBuildError) as ex:
|
|
76
76
|
raise ActionFailedError(str(ex))
|
|
@@ -2,9 +2,11 @@
|
|
|
2
2
|
UV-based Python dependency packager for AWS Lambda
|
|
3
3
|
"""
|
|
4
4
|
|
|
5
|
+
import copy
|
|
5
6
|
import logging
|
|
6
7
|
import os
|
|
7
|
-
|
|
8
|
+
import re
|
|
9
|
+
from typing import Dict, List, Optional, Set
|
|
8
10
|
|
|
9
11
|
from aws_lambda_builders.architecture import ARM64, X86_64
|
|
10
12
|
|
|
@@ -22,6 +24,7 @@ class SubprocessUv:
|
|
|
22
24
|
osutils = OSUtils()
|
|
23
25
|
self._osutils = osutils
|
|
24
26
|
self._uv_executable = self._find_uv_executable()
|
|
27
|
+
self._warnings_seen: Set[str] = set()
|
|
25
28
|
|
|
26
29
|
def _find_uv_executable(self) -> str:
|
|
27
30
|
"""Find UV executable in PATH."""
|
|
@@ -74,9 +77,28 @@ class SubprocessUv:
|
|
|
74
77
|
LOG.debug("UV command return code: %d", rc)
|
|
75
78
|
LOG.debug("UV stdout: %s", stdout)
|
|
76
79
|
LOG.debug("UV stderr: %s", stderr)
|
|
80
|
+
self._log_warnings(stderr)
|
|
77
81
|
|
|
78
82
|
return rc, stdout, stderr
|
|
79
83
|
|
|
84
|
+
def _log_warnings(self, stderr: Optional[str]) -> None:
|
|
85
|
+
"""Log each `warning:` block uv prints, once per build; uv repeats some on every command."""
|
|
86
|
+
blocks: List[List[str]] = []
|
|
87
|
+
current = None
|
|
88
|
+
for line in (stderr or "").splitlines():
|
|
89
|
+
if line.startswith("warning:"):
|
|
90
|
+
current = [line]
|
|
91
|
+
blocks.append(current)
|
|
92
|
+
elif current is not None and line[:1] in (" ", "\t"):
|
|
93
|
+
current.append(line) # uv indents a warning's continuation lines
|
|
94
|
+
else:
|
|
95
|
+
current = None
|
|
96
|
+
for block in blocks:
|
|
97
|
+
message = "\n".join(block)
|
|
98
|
+
if message not in self._warnings_seen:
|
|
99
|
+
self._warnings_seen.add(message)
|
|
100
|
+
LOG.warning("uv %s", message)
|
|
101
|
+
|
|
80
102
|
|
|
81
103
|
class UvRunner:
|
|
82
104
|
"""High-level wrapper around UV operations."""
|
|
@@ -95,6 +117,17 @@ class UvRunner:
|
|
|
95
117
|
"""Get UV version."""
|
|
96
118
|
return self._uv.get_uv_version()
|
|
97
119
|
|
|
120
|
+
def cache_dir(self, cwd: Optional[str] = None) -> Optional[str]:
|
|
121
|
+
"""Get the cache directory UV would use, or None if UV can't report it.
|
|
122
|
+
|
|
123
|
+
Ask from the project directory: a project can set its own cache-dir in
|
|
124
|
+
``[tool.uv]``, and UV only reads that when it runs there.
|
|
125
|
+
"""
|
|
126
|
+
rc, stdout, _ = self._uv.run_uv_command(["cache", "dir"], cwd)
|
|
127
|
+
if rc != 0 or not stdout:
|
|
128
|
+
return None
|
|
129
|
+
return stdout.strip()
|
|
130
|
+
|
|
98
131
|
def install_requirements(
|
|
99
132
|
self,
|
|
100
133
|
requirements_path: str,
|
|
@@ -108,11 +141,10 @@ class UvRunner:
|
|
|
108
141
|
"""
|
|
109
142
|
Install requirements using UV pip interface.
|
|
110
143
|
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
|
|
114
|
-
|
|
115
|
-
build's scratch directory is deleted when the build finishes.
|
|
144
|
+
Cache options come from ``config``. Normally that leaves UV on its own default cache,
|
|
145
|
+
which outlives a single build so UV can reuse downloads across functions and builds.
|
|
146
|
+
Only when that default can't be created does the builder point ``config`` at a
|
|
147
|
+
cache under the build's scratch directory, which is discarded after the build.
|
|
116
148
|
|
|
117
149
|
Args:
|
|
118
150
|
requirements_path: Path to requirements.txt file
|
|
@@ -127,12 +159,12 @@ class UvRunner:
|
|
|
127
159
|
|
|
128
160
|
args = ["pip", "install"]
|
|
129
161
|
|
|
130
|
-
#
|
|
131
|
-
args.extend(["-r", requirements_path])
|
|
162
|
+
# Resolve the requirements file before UV changes to the project or workspace directory
|
|
163
|
+
args.extend(["-r", os.path.abspath(requirements_path)])
|
|
132
164
|
|
|
133
|
-
# Resolve --target to an absolute path: UV runs
|
|
134
|
-
# relative target (e.g. the incremental-build dependencies dir) would otherwise be
|
|
135
|
-
# under the
|
|
165
|
+
# Resolve --target to an absolute path: UV runs from the project or workspace directory,
|
|
166
|
+
# so a relative target (e.g. the incremental-build dependencies dir) would otherwise be
|
|
167
|
+
# created under the UV's cwd instead of the build root.
|
|
136
168
|
args.extend(["--target", os.path.abspath(target_dir)])
|
|
137
169
|
|
|
138
170
|
# Add configuration arguments
|
|
@@ -152,7 +184,14 @@ class UvRunner:
|
|
|
152
184
|
|
|
153
185
|
platform_key = (platform, architecture)
|
|
154
186
|
if platform_key in platform_mapping:
|
|
155
|
-
|
|
187
|
+
python_platform = platform_mapping[platform_key]
|
|
188
|
+
if python_version:
|
|
189
|
+
version_info = tuple(int(part) for part in python_version.split(".")[:2])
|
|
190
|
+
# Match Lambda's AL2/AL2023 manylinux targets, not the build host's glibc.
|
|
191
|
+
manylinux_version = "2_34" if version_info >= (3, 12) else "2_17"
|
|
192
|
+
target_arch = "aarch64" if architecture == ARM64 else "x86_64"
|
|
193
|
+
python_platform = f"{target_arch}-manylinux_{manylinux_version}"
|
|
194
|
+
args.extend(["--python-platform", python_platform])
|
|
156
195
|
|
|
157
196
|
# Execute UV pip install
|
|
158
197
|
rc, stdout, stderr = self._uv.run_uv_command(args, cwd)
|
|
@@ -203,6 +242,7 @@ class PythonUvDependencyBuilder:
|
|
|
203
242
|
|
|
204
243
|
if config is None:
|
|
205
244
|
config = UvConfig()
|
|
245
|
+
config = self._with_writable_cache(config, scratch_dir_path, os.path.dirname(manifest_path))
|
|
206
246
|
|
|
207
247
|
# Determine Python version from runtime
|
|
208
248
|
python_version = self._extract_python_version(self.runtime)
|
|
@@ -226,6 +266,23 @@ class PythonUvDependencyBuilder:
|
|
|
226
266
|
LOG.error("Failed to build dependencies: %s", str(e))
|
|
227
267
|
raise
|
|
228
268
|
|
|
269
|
+
def _with_writable_cache(self, config: UvConfig, scratch_dir: str, project_dir: str) -> UvConfig:
|
|
270
|
+
"""Use a cache under scratch_dir only when UV's own cache can't be created.
|
|
271
|
+
|
|
272
|
+
For example, a container build run as a host uid that has no home directory.
|
|
273
|
+
"""
|
|
274
|
+
if config.cache_dir or config.no_cache:
|
|
275
|
+
return config
|
|
276
|
+
cache_dir = self._uv_runner.cache_dir(cwd=project_dir)
|
|
277
|
+
if not cache_dir or _can_create_dir(cache_dir):
|
|
278
|
+
return config
|
|
279
|
+
# Absolute, because UV runs from the project and the workspace root in turn.
|
|
280
|
+
fallback = os.path.abspath(os.path.join(scratch_dir, "uv-cache"))
|
|
281
|
+
LOG.warning("UV cache directory %s is not writable, using %s for this build", cache_dir, fallback)
|
|
282
|
+
config = copy.copy(config)
|
|
283
|
+
config.cache_dir = fallback
|
|
284
|
+
return config
|
|
285
|
+
|
|
229
286
|
def _get_manifest_handler(self, manifest_name: str):
|
|
230
287
|
"""Get the appropriate handler function for a manifest file.
|
|
231
288
|
|
|
@@ -261,19 +318,108 @@ class PythonUvDependencyBuilder:
|
|
|
261
318
|
"""
|
|
262
319
|
Smart pyproject.toml handler that checks for uv.lock.
|
|
263
320
|
|
|
264
|
-
If uv.lock exists
|
|
321
|
+
If uv.lock exists, use lock-based build for more precise dependency resolution.
|
|
265
322
|
Otherwise, use standard pyproject.toml build.
|
|
266
323
|
"""
|
|
267
|
-
|
|
268
|
-
|
|
324
|
+
project_dir = os.path.dirname(manifest_path)
|
|
325
|
+
workspace_dir = self._resolve_workspace_dir(project_dir)
|
|
326
|
+
uv_lock_path = os.path.join(workspace_dir, "uv.lock")
|
|
269
327
|
|
|
270
328
|
if os.path.exists(uv_lock_path):
|
|
271
|
-
LOG.info("Found uv.lock
|
|
329
|
+
LOG.info("Found uv.lock at %s - using lock-based build for precise dependencies", uv_lock_path)
|
|
272
330
|
# Use lock file for more precise builds
|
|
273
|
-
self._build_from_lock_file(
|
|
331
|
+
self._build_from_lock_file(
|
|
332
|
+
uv_lock_path,
|
|
333
|
+
target_dir,
|
|
334
|
+
scratch_dir,
|
|
335
|
+
python_version,
|
|
336
|
+
architecture,
|
|
337
|
+
config,
|
|
338
|
+
project_dir=project_dir,
|
|
339
|
+
workspace_dir=workspace_dir,
|
|
340
|
+
)
|
|
274
341
|
else:
|
|
275
342
|
# Standard pyproject.toml build
|
|
276
|
-
self._build_from_pyproject(
|
|
343
|
+
self._build_from_pyproject(
|
|
344
|
+
manifest_path,
|
|
345
|
+
target_dir,
|
|
346
|
+
scratch_dir,
|
|
347
|
+
python_version,
|
|
348
|
+
architecture,
|
|
349
|
+
config,
|
|
350
|
+
workspace_dir=workspace_dir,
|
|
351
|
+
)
|
|
352
|
+
|
|
353
|
+
def _resolve_workspace_dir(self, project_dir: str) -> str:
|
|
354
|
+
"""Find the workspace root, falling back for UV versions without this command."""
|
|
355
|
+
version = self._uv_runner.uv_version
|
|
356
|
+
# Only interpret plain release versions. Probe the command for unknown
|
|
357
|
+
# or prerelease versions instead of assuming whether it is supported.
|
|
358
|
+
if version and re.fullmatch(r"[0-9]+\.[0-9]+\.[0-9]+", version):
|
|
359
|
+
if tuple(int(part) for part in version.split(".")) < (0, 9, 9):
|
|
360
|
+
self._log_workspace_fallback(project_dir)
|
|
361
|
+
return project_dir
|
|
362
|
+
|
|
363
|
+
rc, stdout, stderr = self._uv_runner._uv.run_uv_command(["workspace", "dir"], cwd=project_dir)
|
|
364
|
+
workspace_dir = stdout.strip() if rc == 0 else ""
|
|
365
|
+
if workspace_dir:
|
|
366
|
+
return workspace_dir
|
|
367
|
+
if rc != 0 and "unrecognized subcommand 'workspace'" in stderr:
|
|
368
|
+
self._log_workspace_fallback(project_dir)
|
|
369
|
+
return project_dir
|
|
370
|
+
# Other failures do not establish that this is a standalone project. Stop
|
|
371
|
+
# rather than risk missing a workspace lock and regenerating it, or installing
|
|
372
|
+
# workspace-relative dependencies from the wrong directory. This deliberately
|
|
373
|
+
# also stops standalone builds when discovery fails. A successful exit with
|
|
374
|
+
# empty output is still a failure to discover the root, not evidence of no workspace.
|
|
375
|
+
reason = stderr.strip() or f"uv workspace dir returned no workspace path (exit code {rc})"
|
|
376
|
+
raise UvBuildError(reason=f"Could not determine the UV workspace root for {project_dir}: {reason}")
|
|
377
|
+
|
|
378
|
+
def _log_workspace_fallback(self, project_dir: str) -> None:
|
|
379
|
+
"""Use workspace configuration only as a warning hint, not as a root or membership decision."""
|
|
380
|
+
LOG.debug(
|
|
381
|
+
"This UV build does not support `uv workspace dir` (requires uv >= 0.9.9); "
|
|
382
|
+
"falling back to project directory %s.",
|
|
383
|
+
project_dir,
|
|
384
|
+
)
|
|
385
|
+
try:
|
|
386
|
+
import tomllib
|
|
387
|
+
except ModuleNotFoundError: # Python 3.10
|
|
388
|
+
try:
|
|
389
|
+
import tomli as tomllib
|
|
390
|
+
except ModuleNotFoundError:
|
|
391
|
+
LOG.debug("Skipping workspace configuration hint: no TOML parser is available.")
|
|
392
|
+
return
|
|
393
|
+
|
|
394
|
+
directory = os.path.abspath(project_dir)
|
|
395
|
+
while True:
|
|
396
|
+
manifest = os.path.join(directory, "pyproject.toml")
|
|
397
|
+
try:
|
|
398
|
+
with open(manifest, "rb") as file:
|
|
399
|
+
config = tomllib.load(file)
|
|
400
|
+
# Ancestor manifests may contain valid TOML with unrelated value types.
|
|
401
|
+
# Only an actual table is a workspace hint; diagnostics must not fail the build.
|
|
402
|
+
tool_config = config.get("tool")
|
|
403
|
+
uv_config = tool_config.get("uv") if isinstance(tool_config, dict) else None
|
|
404
|
+
has_uv_workspace_table = isinstance(uv_config, dict) and isinstance(uv_config.get("workspace"), dict)
|
|
405
|
+
if has_uv_workspace_table:
|
|
406
|
+
LOG.warning(
|
|
407
|
+
"UV does not support `uv workspace dir` (requires uv >= 0.9.9), and workspace "
|
|
408
|
+
"configuration was found in %s. Falling back to project directory %s. "
|
|
409
|
+
"If this project is a member of that workspace, upgrade uv. "
|
|
410
|
+
"Workspace members and exclusions have not been evaluated.",
|
|
411
|
+
manifest,
|
|
412
|
+
project_dir,
|
|
413
|
+
)
|
|
414
|
+
return
|
|
415
|
+
except FileNotFoundError:
|
|
416
|
+
pass
|
|
417
|
+
except (OSError, ValueError) as error:
|
|
418
|
+
LOG.debug("Could not inspect workspace configuration in %s: %s", manifest, error)
|
|
419
|
+
parent = os.path.dirname(directory)
|
|
420
|
+
if parent == directory:
|
|
421
|
+
return
|
|
422
|
+
directory = parent
|
|
277
423
|
|
|
278
424
|
def _is_requirements_file(self, filename: str) -> bool:
|
|
279
425
|
"""
|
|
@@ -297,6 +443,66 @@ class PythonUvDependencyBuilder:
|
|
|
297
443
|
|
|
298
444
|
return False
|
|
299
445
|
|
|
446
|
+
@staticmethod
|
|
447
|
+
def _lock_export_options(lock_path: str) -> List[str]:
|
|
448
|
+
"""Reuse the resolver settings that produced the lock when checking it for export."""
|
|
449
|
+
try:
|
|
450
|
+
import tomllib
|
|
451
|
+
except ModuleNotFoundError: # Python 3.10
|
|
452
|
+
import tomli as tomllib
|
|
453
|
+
|
|
454
|
+
try:
|
|
455
|
+
with open(lock_path, "rb") as lock_file:
|
|
456
|
+
options = tomllib.load(lock_file).get("options", {})
|
|
457
|
+
except FileNotFoundError:
|
|
458
|
+
# Leave missing-lock diagnostics to UV.
|
|
459
|
+
return []
|
|
460
|
+
|
|
461
|
+
# Relative cutoffs also store a placeholder date for backwards compatibility.
|
|
462
|
+
if "exclude-newer-span" in options:
|
|
463
|
+
options["exclude-newer"] = options["exclude-newer-span"]
|
|
464
|
+
|
|
465
|
+
args = []
|
|
466
|
+
for option, flag in (
|
|
467
|
+
("resolution-mode", "--resolution"),
|
|
468
|
+
("prerelease-mode", "--prerelease"),
|
|
469
|
+
("fork-strategy", "--fork-strategy"),
|
|
470
|
+
("exclude-newer", "--exclude-newer"),
|
|
471
|
+
):
|
|
472
|
+
if option in options:
|
|
473
|
+
args.extend([flag, options[option]])
|
|
474
|
+
for package, cutoff in options.get("exclude-newer-package", {}).items():
|
|
475
|
+
value = cutoff
|
|
476
|
+
if cutoff is False:
|
|
477
|
+
# UV only accepts the lowercase TOML spelling for an opt-out.
|
|
478
|
+
value = "false"
|
|
479
|
+
elif isinstance(cutoff, dict):
|
|
480
|
+
value = cutoff["span"] if "span" in cutoff else cutoff["timestamp"]
|
|
481
|
+
args.extend(["--exclude-newer-package", f"{package}={value}"])
|
|
482
|
+
return args
|
|
483
|
+
|
|
484
|
+
@staticmethod
|
|
485
|
+
def _check_prune_names(lock_path: str, prune: List[str]) -> None:
|
|
486
|
+
"""Fail on prune names missing from the lock; `uv export --prune` ignores them silently."""
|
|
487
|
+
if not prune:
|
|
488
|
+
return
|
|
489
|
+
try:
|
|
490
|
+
import tomllib
|
|
491
|
+
except ModuleNotFoundError: # Python 3.10
|
|
492
|
+
import tomli as tomllib
|
|
493
|
+
|
|
494
|
+
try:
|
|
495
|
+
with open(lock_path, "rb") as lock_file:
|
|
496
|
+
packages = tomllib.load(lock_file).get("package", [])
|
|
497
|
+
except FileNotFoundError:
|
|
498
|
+
# Leave missing-lock diagnostics to UV.
|
|
499
|
+
return
|
|
500
|
+
|
|
501
|
+
locked = {package.get("name") for package in packages if isinstance(package, dict)}
|
|
502
|
+
missing = [name for name in prune if re.sub(r"[-_.]+", "-", name).lower() not in locked]
|
|
503
|
+
if missing:
|
|
504
|
+
raise LockFileError(reason=f"Build option uv_prune names packages not in {lock_path}: {', '.join(missing)}")
|
|
505
|
+
|
|
300
506
|
def _build_from_lock_file(
|
|
301
507
|
self,
|
|
302
508
|
lock_path: str,
|
|
@@ -305,6 +511,8 @@ class PythonUvDependencyBuilder:
|
|
|
305
511
|
python_version: str,
|
|
306
512
|
architecture: str,
|
|
307
513
|
config: UvConfig,
|
|
514
|
+
project_dir: Optional[str] = None,
|
|
515
|
+
workspace_dir: Optional[str] = None,
|
|
308
516
|
) -> None:
|
|
309
517
|
"""Build dependencies from uv.lock file.
|
|
310
518
|
|
|
@@ -315,17 +523,22 @@ class PythonUvDependencyBuilder:
|
|
|
315
523
|
LOG.info("Building from UV lock file")
|
|
316
524
|
|
|
317
525
|
try:
|
|
318
|
-
project_dir
|
|
526
|
+
if project_dir is None:
|
|
527
|
+
project_dir = os.path.dirname(lock_path)
|
|
528
|
+
self._check_prune_names(lock_path, config.prune)
|
|
319
529
|
|
|
320
530
|
# Export lock file to requirements.txt for platform-specific install
|
|
321
|
-
|
|
531
|
+
# Export and install may run from different directories in a workspace
|
|
532
|
+
temp_requirements = os.path.abspath(os.path.join(scratch_dir, "lock_requirements.txt"))
|
|
322
533
|
export_args = [
|
|
323
534
|
"export",
|
|
535
|
+
"--locked", # Reject stale locks rather than rewriting them or omitting new dependencies
|
|
324
536
|
"--format",
|
|
325
537
|
"requirements.txt",
|
|
326
538
|
"--no-emit-project", # Don't include the project itself, only dependencies
|
|
327
|
-
"--no-hashes", # Skip hashes for cleaner output (optional)
|
|
328
539
|
"--no-default-groups", # Exclude PEP 735 default groups (e.g. dev/test) from Lambda zips
|
|
540
|
+
# Install package bodies instead of editable .pth links, which break in Lambda zips.
|
|
541
|
+
"--no-editable",
|
|
329
542
|
"--output-file",
|
|
330
543
|
temp_requirements,
|
|
331
544
|
# We want to specify the version because `uv export` might default to using a different one
|
|
@@ -333,11 +546,19 @@ class PythonUvDependencyBuilder:
|
|
|
333
546
|
"--python",
|
|
334
547
|
python_version,
|
|
335
548
|
]
|
|
549
|
+
export_args.extend(config.to_export_args())
|
|
550
|
+
export_args.extend(self._lock_export_options(lock_path))
|
|
551
|
+
export_args.extend(config.cache_args())
|
|
336
552
|
|
|
337
553
|
rc, stdout, stderr = self._uv_runner._uv.run_uv_command(export_args, cwd=project_dir)
|
|
338
554
|
if rc != 0:
|
|
339
555
|
raise LockFileError(reason=f"Failed to export lock file: {stderr}")
|
|
340
556
|
|
|
557
|
+
# Export selects the member's dependencies, but exported local paths
|
|
558
|
+
# are relative to the workspace root.
|
|
559
|
+
if workspace_dir is None:
|
|
560
|
+
workspace_dir = self._resolve_workspace_dir(project_dir)
|
|
561
|
+
|
|
341
562
|
# Install with platform targeting
|
|
342
563
|
self._uv_runner.install_requirements(
|
|
343
564
|
requirements_path=temp_requirements,
|
|
@@ -345,7 +566,7 @@ class PythonUvDependencyBuilder:
|
|
|
345
566
|
config=config,
|
|
346
567
|
python_version=python_version,
|
|
347
568
|
platform="linux",
|
|
348
|
-
cwd=
|
|
569
|
+
cwd=workspace_dir,
|
|
349
570
|
architecture=architecture,
|
|
350
571
|
)
|
|
351
572
|
except LockFileError:
|
|
@@ -361,6 +582,7 @@ class PythonUvDependencyBuilder:
|
|
|
361
582
|
python_version: str,
|
|
362
583
|
architecture: str,
|
|
363
584
|
config: UvConfig,
|
|
585
|
+
workspace_dir: Optional[str] = None,
|
|
364
586
|
) -> None:
|
|
365
587
|
"""Build dependencies from pyproject.toml file using UV's native workflow."""
|
|
366
588
|
LOG.info("Building from pyproject.toml using UV lock and export")
|
|
@@ -371,6 +593,8 @@ class PythonUvDependencyBuilder:
|
|
|
371
593
|
lock_args = ["lock", "--no-progress"]
|
|
372
594
|
if python_version:
|
|
373
595
|
lock_args.extend(["--python", python_version])
|
|
596
|
+
# uv lock also needs a writable cache, same as export and pip install.
|
|
597
|
+
lock_args.extend(config.cache_args())
|
|
374
598
|
|
|
375
599
|
project_dir = os.path.dirname(pyproject_path)
|
|
376
600
|
rc, stdout, stderr = self._uv_runner._uv.run_uv_command(lock_args, cwd=project_dir)
|
|
@@ -378,8 +602,19 @@ class PythonUvDependencyBuilder:
|
|
|
378
602
|
raise UvBuildError(reason=f"UV lock failed: {stderr}")
|
|
379
603
|
|
|
380
604
|
# Reuse lock file build logic
|
|
381
|
-
|
|
382
|
-
|
|
605
|
+
if workspace_dir is None:
|
|
606
|
+
workspace_dir = self._resolve_workspace_dir(project_dir)
|
|
607
|
+
lock_path = os.path.join(workspace_dir, "uv.lock")
|
|
608
|
+
self._build_from_lock_file(
|
|
609
|
+
lock_path,
|
|
610
|
+
target_dir,
|
|
611
|
+
scratch_dir,
|
|
612
|
+
python_version,
|
|
613
|
+
architecture,
|
|
614
|
+
config,
|
|
615
|
+
project_dir=project_dir,
|
|
616
|
+
workspace_dir=workspace_dir,
|
|
617
|
+
)
|
|
383
618
|
|
|
384
619
|
except Exception as e:
|
|
385
620
|
raise UvBuildError(reason=f"Failed to build from pyproject.toml: {str(e)}")
|
|
@@ -401,6 +636,8 @@ class PythonUvDependencyBuilder:
|
|
|
401
636
|
LOG.info("Building from requirements file")
|
|
402
637
|
|
|
403
638
|
try:
|
|
639
|
+
# Resolve the manifest before running UV from its directory for local dependencies.
|
|
640
|
+
requirements_path = os.path.abspath(requirements_path)
|
|
404
641
|
self._uv_runner.install_requirements(
|
|
405
642
|
requirements_path=requirements_path,
|
|
406
643
|
target_dir=target_dir,
|
|
@@ -408,6 +645,7 @@ class PythonUvDependencyBuilder:
|
|
|
408
645
|
python_version=python_version,
|
|
409
646
|
platform="linux",
|
|
410
647
|
architecture=architecture,
|
|
648
|
+
cwd=os.path.dirname(requirements_path),
|
|
411
649
|
)
|
|
412
650
|
except Exception as e:
|
|
413
651
|
raise UvBuildError(reason=f"Failed to build from requirements: {str(e)}")
|
|
@@ -422,3 +660,13 @@ class PythonUvDependencyBuilder:
|
|
|
422
660
|
return runtime.replace("python", "")
|
|
423
661
|
|
|
424
662
|
return runtime
|
|
663
|
+
|
|
664
|
+
|
|
665
|
+
def _can_create_dir(path: str) -> bool:
|
|
666
|
+
"""Whether path exists as a writable directory or could be created."""
|
|
667
|
+
while not os.path.exists(path):
|
|
668
|
+
parent = os.path.dirname(path)
|
|
669
|
+
if parent == path:
|
|
670
|
+
return False
|
|
671
|
+
path = parent
|
|
672
|
+
return os.path.isdir(path) and os.access(path, os.W_OK)
|