Merge branch 'develop' into docker-args

Author: roger-zhangg

.github/workflows/ai-code-review.yml

@@ -45,7 +45,7 @@ dependencies = [
     "docker~=7.1.0",
     "dateparser~=1.3",
     "requests>=2.32.5,<2.34.0",
-    "aws_lambda_builders==1.63.0",
+    "aws_lambda_builders==1.64.0",
     "tomlkit==0.14.0",
     "watchdog==4.0.2",
     "rich~=14.3.3",
@@ -115,9 +115,13 @@ select = [
     "F",  # Pyflakes
     "PL", # pylint
     "I",  # isort
+    "TID", # flake8-tidy-imports
 ]
 ignore = ["PLR0913", "PLC0415", "PLW1641"]
 
+[tool.ruff.lint.flake8-tidy-imports]
+ban-relative-imports = "all"
+
 [tool.ruff.lint.pylint]
 max-branches = 25
 max-returns = 8

pyproject.toml

@@ -14,9 +14,9 @@ attrs==26.1.0 \
     # via
     #   jsonschema
     #   referencing
-aws-lambda-builders==1.63.0 \
-    --hash=sha256:58662561bd52d931d62b3ba327acfa0c8e9117c4593eb816b3454ce6b47f4076 \
-    --hash=sha256:9e03d163d78950d8896055afa4f19c0999ea0103076dfa8b0f2012d2503b1657
+aws-lambda-builders==1.64.0 \
+    --hash=sha256:56ee91ad18a0811c94f546e1a2fe5e76ca56d77eaaf7c612a12563a5b3d5b813 \
+    --hash=sha256:b5c045698f8bc48c25210b1f37848e57dd733c3a3d4593df6f8c10c6bd063009
     # via aws-sam-cli (pyproject.toml)
 aws-sam-translator==1.109.0 \
     --hash=sha256:0c5e60223ae8434ce0c6bdb9a491d69ba3ec97e15c0d825d3803f7806382d804 \

requirements/reproducible-linux.txt

@@ -14,9 +14,9 @@ attrs==26.1.0 \
     # via
     #   jsonschema
     #   referencing
-aws-lambda-builders==1.63.0 \
-    --hash=sha256:58662561bd52d931d62b3ba327acfa0c8e9117c4593eb816b3454ce6b47f4076 \
-    --hash=sha256:9e03d163d78950d8896055afa4f19c0999ea0103076dfa8b0f2012d2503b1657
+aws-lambda-builders==1.64.0 \
+    --hash=sha256:56ee91ad18a0811c94f546e1a2fe5e76ca56d77eaaf7c612a12563a5b3d5b813 \
+    --hash=sha256:b5c045698f8bc48c25210b1f37848e57dd733c3a3d4593df6f8c10c6bd063009
     # via aws-sam-cli (pyproject.toml)
 aws-sam-translator==1.109.0 \
     --hash=sha256:0c5e60223ae8434ce0c6bdb9a491d69ba3ec97e15c0d825d3803f7806382d804 \

requirements/reproducible-mac.txt

@@ -14,9 +14,9 @@ attrs==26.1.0 \
     # via
     #   jsonschema
     #   referencing
-aws-lambda-builders==1.63.0 \
-    --hash=sha256:58662561bd52d931d62b3ba327acfa0c8e9117c4593eb816b3454ce6b47f4076 \
-    --hash=sha256:9e03d163d78950d8896055afa4f19c0999ea0103076dfa8b0f2012d2503b1657
+aws-lambda-builders==1.64.0 \
+    --hash=sha256:56ee91ad18a0811c94f546e1a2fe5e76ca56d77eaaf7c612a12563a5b3d5b813 \
+    --hash=sha256:b5c045698f8bc48c25210b1f37848e57dd733c3a3d4593df6f8c10c6bd063009
     # via aws-sam-cli (pyproject.toml)
 aws-sam-translator==1.109.0 \
     --hash=sha256:0c5e60223ae8434ce0c6bdb9a491d69ba3ec97e15c0d825d3803f7806382d804 \

requirements/reproducible-win.txt

@@ -5,7 +5,7 @@
 
 import click
 
-from .context import Context
+from samcli.cli.context import Context
 
 
 def debug_option(f):

samcli/cli/options.py

@@ -3,4 +3,4 @@
 """
 
 # Expose the cli object here
-from .command import cli  # pragma: no cover
+from samcli.commands.bootstrap.command import cli  # pragma: no cover

samcli/commands/bootstrap/__init__.py

@@ -59,7 +59,7 @@
   ------------------
   1. Python 3.8, 3.9, 3.10, 3.11, 3.12, 3.13, 3.14 using PIP\n
   2. Nodejs 24.x, 22.x, 20.x, 18.x, 16.x, 14.x, 12.x using NPM\n
-  3. Ruby 3.2, 3.3, 3.4 using Bundler\n
+  3. Ruby 3.2, 3.3, 3.4, 4.0 using Bundler\n
   4. Java 8, Java 11, Java 17, Java 21, Java 25 using Gradle and Maven\n
   5. Dotnet6, Dotnet8, Dotnet10 using Dotnet CLI\n
   6. Go 1.x using Go Modules (without --use-container)\n

samcli/commands/build/command.py

@@ -2,4 +2,4 @@
 Expose top level cli command for `init`
 """
 
-from .command import cli
+from samcli.commands.init.command import cli

samcli/commands/init/__init__.py

@@ -13,6 +13,7 @@
 from samcli.commands._utils.click_mutex import ClickMutex
 from samcli.commands._utils.command_exception_handler import command_exception_handler
 from samcli.commands.pipeline.bootstrap.core.command import PipelineBootstrapCommand
+from samcli.commands.pipeline.bootstrap.guided_context import BITBUCKET, GITHUB_ACTIONS, GITLAB, IAM, OPEN_ID_CONNECT
 from samcli.commands.pipeline.bootstrap.oidc_config import (
     BitbucketOidcConfig,
     GitHubOidcConfig,
@@ -24,8 +25,6 @@
 from samcli.lib.telemetry.metric import track_command
 from samcli.lib.utils.version_checker import check_newer_version
 
-from .guided_context import BITBUCKET, GITHUB_ACTIONS, GITLAB, IAM, OPEN_ID_CONNECT
-
 SHORT_HELP = "Generates the required AWS resources to connect your CI/CD system."
 
 HELP_TEXT = """