Merge from aws/aws-sam-cli/develop

aws · Sep 11, 2024 · 40df58e · 40df58e
2 parents 39e6077 + 4a7a900
commit 40df58e
Show file tree

Hide file tree

Showing 29 changed files with 1,046 additions and 911 deletions.
diff --git a/.github/workflows/update-reproducibles.yml b/.github/workflows/update-reproducibles.yml
@@ -25,7 +25,7 @@ jobs:
             python: 3.8
             target: update-reproducible-mac-reqs
           - os: windows-latest
-            python: 3.11
+            python: 3.12
             target: update-reproducible-win-reqs
       max-parallel: 1
     runs-on: ${{ matrix.os }}

diff --git a/appveyor-linux-binary.yml b/appveyor-linux-binary.yml
@@ -255,7 +255,7 @@ for:
       - sh: "sudo mv /opt/terraform/terraform /usr/local/bin/"
       - sh: "terraform -version"
 
-      - sh: "pytest -vv tests/integration/local/invoke tests/integration/local/generate_event --json-report --json-report-file=TEST_REPORT-integration-local.json"
+      - sh: "pytest -vv --reruns 3 tests/integration/local/invoke tests/integration/local/generate_event --json-report --json-report-file=TEST_REPORT-integration-local.json"
 
   # Integ testing local
   -
@@ -272,7 +272,7 @@ for:
       - sh: "sudo mv /opt/terraform/terraform /usr/local/bin/"
       - sh: "terraform -version"
 
-      - sh: "pytest -vv tests/integration/local/start_api tests/integration/local/start_lambda --json-report --json-report-file=TEST_REPORT-integration-local-start.json"
+      - sh: "pytest -vv --reruns 3 tests/integration/local/start_api tests/integration/local/start_lambda --json-report --json-report-file=TEST_REPORT-integration-local-start.json"
 
   # Other testing
   -
@@ -282,4 +282,4 @@ for:
 
     test_script:
       - sh: "pytest -vv -n 4 --reruns 4 --dist loadgroup tests/integration tests/end_to_end --ignore=tests/integration/buildcmd --ignore=tests/integration/delete --ignore=tests/integration/deploy --ignore=tests/integration/package --ignore=tests/integration/sync --ignore=tests/integration/local --json-report --json-report-file=TEST_REPORT-integration-others.json"
-      - sh: "pytest -vv tests/regression --json-report --json-report-file=TEST_REPORT-regression.json"
+      - sh: "pytest -vv --reruns 3 tests/regression --json-report --json-report-file=TEST_REPORT-regression.json"
diff --git a/appveyor-ubuntu.yml b/appveyor-ubuntu.yml
@@ -241,7 +241,7 @@ for:
       - sh: "sudo mv /opt/terraform/terraform /usr/local/bin/"
       - sh: "terraform -version"
 
-      - sh: "pytest -vv tests/integration/local/invoke tests/integration/local/generate_event --json-report --json-report-file=TEST_REPORT-integration-local.json"
+      - sh: "pytest -vv --reruns 3 tests/integration/local/invoke tests/integration/local/generate_event --json-report --json-report-file=TEST_REPORT-integration-local.json"
 
   # Integ testing local
   -
@@ -258,7 +258,7 @@ for:
       - sh: "sudo mv /opt/terraform/terraform /usr/local/bin/"
       - sh: "terraform -version"
 
-      - sh: "pytest -vv tests/integration/local/start_api tests/integration/local/start_lambda --json-report --json-report-file=TEST_REPORT-integration-local-start.json"
+      - sh: "pytest -vv --reruns 3 tests/integration/local/start_api tests/integration/local/start_lambda --json-report --json-report-file=TEST_REPORT-integration-local-start.json"
 
   # Other testing
   -
@@ -268,4 +268,4 @@ for:
 
     test_script:
       - sh: "pytest -vv -n 4 --reruns 4 --dist loadgroup tests/integration tests/end_to_end --ignore=tests/integration/buildcmd --ignore=tests/integration/delete --ignore=tests/integration/deploy --ignore=tests/integration/package --ignore=tests/integration/sync --ignore=tests/integration/local --json-report --json-report-file=TEST_REPORT-integration-others.json"
-      - sh: "pytest -vv tests/regression --json-report --json-report-file=TEST_REPORT-regression.json"
+      - sh: "pytest -vv --reruns 3 tests/regression --json-report --json-report-file=TEST_REPORT-regression.json"
diff --git a/appveyor-windows-binary.yml b/appveyor-windows-binary.yml
@@ -269,7 +269,7 @@ for:
       - "choco install terraform"
       - "terraform -version"
 
-      - ps: "pytest -vv tests/integration/local/invoke tests/integration/local/generate_event --json-report --json-report-file=TEST_REPORT-integration-local.json"
+      - ps: "pytest -vv --reruns 3 tests/integration/local/invoke tests/integration/local/generate_event --json-report --json-report-file=TEST_REPORT-integration-local.json"
 
   #Integ testing local start-api
   - matrix:
@@ -281,7 +281,7 @@ for:
       - "choco install terraform"
       - "terraform -version"
 
-      - ps: "pytest -vv tests/integration/local/start_api --json-report --json-report-file=TEST_REPORT-integration-local-api.json"
+      - ps: "pytest -vv --reruns 3 tests/integration/local/start_api --json-report --json-report-file=TEST_REPORT-integration-local-api.json"
 
   #Integ testing local start-lambda
   - matrix:
@@ -293,7 +293,7 @@ for:
       - "choco install terraform"
       - "terraform -version"
 
-      - ps: "pytest -vv tests/integration/local/start_lambda --json-report --json-report-file=TEST_REPORT-integration-local-lambda.json"
+      - ps: "pytest -vv --reruns 3 tests/integration/local/start_lambda --json-report --json-report-file=TEST_REPORT-integration-local-lambda.json"
 
   #Other testing
   - matrix:
@@ -302,7 +302,7 @@ for:
 
     test_script:
       - ps: "pytest -vv -n 4 --reruns 4 --dist loadgroup tests/integration tests/end_to_end --ignore=tests/integration/buildcmd --ignore=tests/integration/delete --ignore=tests/integration/deploy --ignore=tests/integration/package --ignore=tests/integration/sync --ignore=tests/integration/local --json-report --json-report-file=TEST_REPORT-integration-others.json"
-      - ps: "pytest -vv tests/regression --json-report --json-report-file=TEST_REPORT-regression.json"
+      - ps: "pytest -vv --reruns 3 tests/regression --json-report --json-report-file=TEST_REPORT-regression.json"
 # Uncomment for RDP
 # on_finish:
 #   - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

diff --git a/appveyor-windows.yml b/appveyor-windows.yml
@@ -260,7 +260,7 @@ for:
       - "choco install terraform"
       - "terraform -version"
 
-      - ps: "pytest -vv tests/integration/local/invoke tests/integration/local/generate_event --json-report --json-report-file=TEST_REPORT-integration-local.json"
+      - ps: "pytest -vv --reruns 3 tests/integration/local/invoke tests/integration/local/generate_event --json-report --json-report-file=TEST_REPORT-integration-local.json"
 
   #Integ testing local start-api
   - matrix:
@@ -272,7 +272,7 @@ for:
       - "choco install terraform"
       - "terraform -version"
 
-      - ps: "pytest -vv tests/integration/local/start_api --json-report --json-report-file=TEST_REPORT-integration-local-api.json"
+      - ps: "pytest -vv --reruns 3 tests/integration/local/start_api --json-report --json-report-file=TEST_REPORT-integration-local-api.json"
 
   #Integ testing local start-lambda
   - matrix:
@@ -284,7 +284,7 @@ for:
       - "choco install terraform"
       - "terraform -version"
 
-      - ps: "pytest -vv tests/integration/local/start_lambda --json-report --json-report-file=TEST_REPORT-integration-local-lambda.json"
+      - ps: "pytest -vv --reruns 3 tests/integration/local/start_lambda --json-report --json-report-file=TEST_REPORT-integration-local-lambda.json"
 
   #Other testing
   - matrix:
@@ -293,7 +293,7 @@ for:
 
     test_script:
       - ps: "pytest -vv -n 4 --reruns 4 --dist loadgroup tests/integration tests/end_to_end --ignore=tests/integration/buildcmd --ignore=tests/integration/delete --ignore=tests/integration/deploy --ignore=tests/integration/package --ignore=tests/integration/sync --ignore=tests/integration/local --json-report --json-report-file=TEST_REPORT-integration-others.json"
-      - ps: "pytest -vv tests/regression --json-report --json-report-file=TEST_REPORT-regression.json"
+      - ps: "pytest -vv --reruns 3 tests/regression --json-report --json-report-file=TEST_REPORT-regression.json"
 # Uncomment for RDP
 # on_finish:
 #   - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1'))

diff --git a/installer/pyinstaller/build-linux.sh b/installer/pyinstaller/build-linux.sh
@@ -12,7 +12,7 @@ if [ "$python_library_zip_filename" = "" ]; then
 fi
 
 if [ "$python_version" = "" ]; then
-    python_version="3.11.8";
+    python_version="3.11.10";
 fi
 
 if [ "$openssl_version" = "" ]; then

diff --git a/installer/pyinstaller/build-mac.sh b/installer/pyinstaller/build-mac.sh
@@ -34,7 +34,7 @@ if [ "$openssl_version" = "" ]; then
 fi
 
 if [ "$python_version" = "" ]; then
-    python_version="3.8.13";
+    python_version="3.8.20";
 fi
 
 if ! [ "$build_binary_name" = "" ]; then

diff --git a/requirements/base.txt b/requirements/base.txt
@@ -12,9 +12,9 @@ docker~=7.1.0
 dateparser~=1.2
 requests~=2.32.3
 aws_lambda_builders==1.50.0
-tomlkit==0.13.0
+tomlkit==0.13.2
 watchdog==4.0.2
-rich~=13.7.1
+rich~=13.8.1
 pyopenssl~=24.2.1
 # Pin to <4.18 to until SAM-T no longer uses RefResolver
 jsonschema<4.24
@@ -28,7 +28,7 @@ regex!=2021.10.8
 tzlocal==5.2
 
 #Adding cfn-lint dependency for SAM validate
-cfn-lint~=1.10.0
+cfn-lint~=1.12.4
 
 # Type checking boto3 objects
-boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]==1.34.159
+boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]==1.35.14
diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -7,22 +7,22 @@ pytest-cov==5.0.0
 # type checking and related stubs
 # mypy adds new rules in new minor versions, which could cause our PR check to fail
 # here we fix its version and upgrade it manually in the future
-mypy==1.11.1
-types-pywin32==306.0.0.20240806
+mypy==1.11.2
+types-pywin32==306.0.0.20240822
 types-PyYAML==6.0.12.20240808
 types-chevron==0.14.2.20240310
-types-psutil==6.0.0.20240621
-types-setuptools==71.1.0.20240813
+types-psutil==6.0.0.20240901
+types-setuptools==74.1.0.20240907
 types-Pygments==2.18.0.20240506 
 types-colorama==0.4.15.20240311
 types-dateparser==1.2.0.20240420
-types-docutils==0.21.0.20240724
+types-docutils==0.21.0.20240907
 types-jsonschema==4.23.0.20240813
 types-pyOpenSSL==24.1.0.20240722
 # lucashuy: pin `types-request` based on the Python version since newer versions of
 # the types require a newer version of requests, which is only installed in newer versions of Python
 types-requests==2.31.0.6; python_version<"3.10"
-types-requests==2.32.0.20240712; python_version>="3.10"
+types-requests==2.32.0.20240907; python_version>="3.10"
 types-urllib3==1.26.25.14
 
 # Test requirements
@@ -38,7 +38,7 @@ pytest-rerunfailures==14.0
 pytest-metadata==3.1.1
 # NOTE (lucashuy): `pytest-json-report` was updated to `pytest-json-report-wip` as the original repository does not seem to be maintained anymore, if `-wip` is updated, validate the changes
 pytest-json-report-wip==1.5.1
-filelock==3.15.4
+filelock==3.16.0
 
 # formatter
 black==24.8.0

diff --git a/requirements/pre-dev.txt b/requirements/pre-dev.txt
@@ -1 +1 @@
-ruff==0.5.7
+ruff==0.6.4