Merge from aws/aws-sam-cli/develop

Author: aws-sam-cli-bot

.github/dependabot.yml

@@ -13,7 +13,7 @@ updates:
     open-pull-requests-limit: 10
 
   - package-ecosystem: "pip"
-    directory: "/requirements"
+    directory: "/"
     schedule:
       interval: "daily"
     target-branch: "develop"
@@ -26,14 +26,13 @@ updates:
     groups:
       boto:
         patterns:
-        - "boto3"
+        - "boto3[crt]"
         - "boto3-stubs*"
-        - "botocore"
+        - "botocore[crt]"
         - "botocore-stubs"
         - "mypy-boto3-*"
-      types:
-        patterns:
-        - "types-*"
+        - "types-awscrt"
+        - "types-s3transfer"
       pytest:
         patterns:
         - "pytest-*"
@@ -42,13 +41,78 @@ updates:
         # as of writing this
         - "pytest-metadata"
         - "pytest-json-report"
+      cookiecutter:
+        patterns:
+        - "cookiecutter"
+        - "arrow"
+        - "binaryornot"
+        - "chardet"
+        - "python-slugify"
+        - "text-unidecode"
+      flask:
+        patterns:
+        - "flask"
+        - "blinker"
+        - "werkzeug"
+        - "itsdangerous"
+      cfn-lint:
+        patterns:
+        - "cfn-lint"
+        - "networkx"
+        - "sympy"
+        - "mpmath"
+        - "jsonpatch"
+        - "jsonpointer"
+      cryptography:
+        patterns:
+        - "cryptography"
+        - "pyopenssl"
+        - "cffi"
+        - "pycparser"
+      requests:
+        patterns:
+        - "requests"
+        - "certifi"
+        - "charset-normalizer"
+        - "idna"
+        - "urllib3"
+      rich:
+        patterns:
+        - "rich"
+        - "markdown-it-py"
+        - "mdurl"
+        - "pygments"
+      jsonschema:
+        patterns:
+        - "jsonschema"
+        - "jsonschema-specifications"
+        - "referencing"
+        - "attrs"
+        - "rpds-py"
+      pydantic:
+        patterns:
+        - "pydantic"
+        - "pydantic-core"
+        - "annotated-types"
+        - "typing-inspection"
+      jinja2:
+        patterns:
+        - "jinja2"
+        - "markupsafe"
+      pyyaml:
+        patterns:
+        - "pyyaml"
+        - "ruamel-yaml"
     ignore:
       # Ignored intentionally since we have a GHA that updates to more
       # completely
       - dependency-name: "aws-sam-translator"
       # Ignored intentionally since we have a GHA that updates to more
       # completely
       - dependency-name: "aws_lambda_builders"
+      # Ignored intentionally since watchdog v5+ breaks sync watch
+      # file change detection; pinned to 4.0.2
+      - dependency-name: "watchdog"
       # The dependencies are intentionally pinned to certain
       # version ranges for specific Python versions
       - dependency-name: "flake8"

.github/workflows/automated-updates-to-sam-cli.yml

@@ -108,12 +108,12 @@ jobs:
           echo "SAM-T cur version is $SAM_T_CUR_VERSION"
           cd ../aws-sam-cli
           git checkout -b update_sam_transform_version
-          SAM_T_PRE_VERSION=$(grep "aws-sam-translator=" requirements/base.txt)
+          SAM_T_PRE_VERSION=$(grep -oP 'aws-sam-translator==\K[0-9.]+' pyproject.toml)
           echo "SAM-T pre version is $SAM_T_PRE_VERSION"
           git reset --hard develop
-          sed -i "s/$SAM_T_PRE_VERSION/aws-sam-translator==$SAM_T_CUR_VERSION/g" requirements/base.txt
+          sed -i "s/aws-sam-translator==$SAM_T_PRE_VERSION/aws-sam-translator==$SAM_T_CUR_VERSION/g" pyproject.toml
           cp -r ../serverless-application-model/tests/translator/input ./tests/functional/commands/validate/lib/models
-          make update-reproducible-reqs-uv
+          make update-reproducible-reqs
           git status
           git diff --quiet && exit 0 # exit if there is no change
           echo "is_new_sam_t=1" >> $GITHUB_ENV # set env variable for next step run decision
@@ -177,11 +177,11 @@ jobs:
           echo "Lambda Builders cur version is $BUILDERS_CUR_VERSION"
           cd ../aws-sam-cli
           git checkout -b update_lambda_builders_version
-          BUILDERS_PRE_VERSION=$(grep "aws_lambda_builders=" requirements/base.txt)
+          BUILDERS_PRE_VERSION=$(grep -oP 'aws_lambda_builders==\K[0-9.]+' pyproject.toml)
           echo "Lambda Builders pre version is $BUILDERS_PRE_VERSION"
           git reset --hard develop
-          sed -i "s/$BUILDERS_PRE_VERSION/aws_lambda_builders==$BUILDERS_CUR_VERSION/g" requirements/base.txt
-          make update-reproducible-reqs-uv
+          sed -i "s/aws_lambda_builders==$BUILDERS_PRE_VERSION/aws_lambda_builders==$BUILDERS_CUR_VERSION/g" pyproject.toml
+          make update-reproducible-reqs
           git status
           git diff --quiet && exit 0 # exit if there is no change
           echo "is_new_lambda_builders=1" >> $GITHUB_ENV # set env variable for next step run decision