Merge from aws/aws-sam-cli/develop

Author: aws-sam-cli-bot

.github/workflows/close-stale-issues.yml

@@ -14,7 +14,7 @@ jobs:
     permissions:
       issues: write
     steps:
-    - uses: aws-actions/stale-issue-cleanup@v6
+    - uses: aws-actions/stale-issue-cleanup@7de35968489e4142233d2a6812519a82e68b5c38 # v6
       with:
         issue-types: issues
 

.github/workflows/closed-issue-message.yml

@@ -9,7 +9,7 @@ jobs:
     permissions:
       issues: write
     steps:
-      - uses: aws-actions/closed-issue-message@v2
+      - uses: aws-actions/closed-issue-message@10aaf6366131b673a7c8b7742f8b3849f1d44f18 # v2
         with:
           # These inputs are both required
           repo-token: "${{ secrets.GITHUB_TOKEN }}"

.github/workflows/integration-tests.yml

@@ -243,7 +243,7 @@ jobs:
           echo "SAM_CLI_DEV=" >> $GITHUB_ENV
 
       - name: Configure AWS credentials via OIDC
-        uses: aws-actions/configure-aws-credentials@v6
+        uses: aws-actions/configure-aws-credentials@ec61189d14ec14c8efccab744f656cffd0e33f37 # v6
         with:
           role-to-assume: ${{ secrets.OIDC_ROLE_ARN }}
           aws-region: us-east-1
@@ -451,14 +451,14 @@ jobs:
 
       - name: Re-authenticate with OIDC for cleanup
         if: always() && env.SCRIPT_PY != ''
-        uses: aws-actions/configure-aws-credentials@v6
+        uses: aws-actions/configure-aws-credentials@ec61189d14ec14c8efccab744f656cffd0e33f37 # v6
         with:
           role-to-assume: ${{ secrets.OIDC_ROLE_ARN }}
           aws-region: us-east-1
 
       - name: Assume test reporting role
         if: always() && env.SCRIPT_PY != ''
-        uses: aws-actions/configure-aws-credentials@v6
+        uses: aws-actions/configure-aws-credentials@ec61189d14ec14c8efccab744f656cffd0e33f37 # v6
         with:
           role-to-assume: ${{ secrets.TESTREPORTING_ARN }}
           aws-region: us-east-1

.github/workflows/pr-labeler.yml

@@ -21,7 +21,7 @@ jobs:
     steps:
       - name: Apply internal/external label
         id: label_step
-        uses: actions/github-script@v8
+        uses: actions/github-script@v9
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |

pyproject.toml

@@ -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

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

@@ -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 \

samcli/__init__.py

@@ -2,4 +2,4 @@
 SAM CLI version
 """
 
-__version__ = "1.158.0"
+__version__ = "1.159.1"

samcli/cli/options.py

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