Merge from aws/aws-sam-cli/develop

.github/workflows/validate_pyinstaller.yml

@@ -39,7 +39,7 @@ jobs:
 
   build-for-mac:
     name: build-pyinstaller-macos
-    runs-on: macos-13
+    runs-on: macos-latest
     if: github.repository_owner == 'aws'
     strategy:
       fail-fast: false

Make.ps1

@@ -92,7 +92,7 @@ function Test {
 }
 
 function Lint {
-    ruff samcli
+    ruff check samcli schema
     mypy setup.py samcli tests
 }
 

Makefile

@@ -36,7 +36,7 @@ smoke-test:
 
 lint:
 	# Linter performs static analysis to catch latent bugs
-	ruff samcli schema
+	ruff check samcli schema
 	# mypy performs type check
 	mypy --exclude /testdata/ --exclude /init/templates/ --no-incremental setup.py samcli tests schema
 
@@ -84,4 +84,4 @@ update-reproducible-win-reqs:
 	pip-compile --generate-hashes --allow-unsafe -o requirements\reproducible-win.txt
 
 
-update-reproducible-reqs: update-reproducible-linux-reqs update-reproducible-mac-reqs
+update-reproducible-reqs: update-reproducible-linux-reqs update-reproducible-mac-reqs

appveyor-windows.yml

@@ -48,10 +48,6 @@ init:
   - ps: New-ItemProperty -Path "HKLM:\SYSTEM\CurrentControlSet\Control\FileSystem" -Name "LongPathsEnabled" -Value 1 -PropertyType DWORD -Force
   - ps: git config --system core.longpaths true
 
-cache:
-  - C:\ProgramData\chocolatey\bin -> appveyor.yml
-  - C:\ProgramData\chocolatey\lib -> appveyor.yml
-
 install:
   # upgrade chocolately
   - choco upgrade chocolatey

installer/pyinstaller/build-mac.sh

@@ -92,7 +92,9 @@ echo "Installing Python"
 curl "https://www.python.org/ftp/python/${python_version}/Python-${python_version}.tgz" --output python.tgz
 tar -xzf python.tgz
 cd Python-"$python_version"
-./configure --enable-shared
+./configure \
+    --enable-shared \
+    --with-openssl=/usr/local
 make -j8
 sudo make -j8 install
 cd ..

pyproject.toml

@@ -4,6 +4,7 @@ requires = ["setuptools", "wheel"]  # PEP 508 specifications.
 [tool.ruff]
 line-length = 120
 
+[tool.ruff.lint]
 select = [
     "E",  # Pycodestyle
     "F",  # Pyflakes
@@ -12,12 +13,12 @@ select = [
 ]
 ignore = ["PLR0913"]
 
-[tool.ruff.pylint]
+[tool.ruff.lint.pylint]
 max-branches = 25
 max-returns = 8
 max-statements = 80
 
-[tool.ruff.per-file-ignores]
+[tool.ruff.lint.per-file-ignores]
 "__init__.py" = ["F401", "E501"]
 "integration_uri.py" = ["E501"] # ARNs are long.
 "app.py" = ["E501"] # Doc links are long.

requirements/base.txt

@@ -6,18 +6,18 @@ jmespath~=1.0.1
 ruamel_yaml~=0.18.6
 PyYAML~=6.0,>=6.0.1
 cookiecutter~=2.6.0
-aws-sam-translator==1.87.0
+aws-sam-translator==1.89.0
 #docker minor version updates can include breaking changes. Auto update micro version only.
 docker~=7.0.0
 dateparser~=1.2
 requests~=2.31.0
-aws_lambda_builders==1.49.0
-tomlkit==0.12.4
+aws_lambda_builders==1.50.0
+tomlkit==0.12.5
 watchdog==4.0.0
 rich~=13.7.1
 pyopenssl~=24.1.0
 # Pin to <4.18 to until SAM-T no longer uses RefResolver
-jsonschema<4.22
+jsonschema<4.23
 
 # Needed for supporting Protocol in Python 3.7, Protocol class became public with python3.8
 typing_extensions>=4.4.0,<5
@@ -28,7 +28,7 @@ regex!=2021.10.8
 tzlocal==5.2
 
 #Adding cfn-lint dependency for SAM validate
-cfn-lint~=0.86.4
+cfn-lint~=0.87.2
 
 # Type checking boto3 objects
-boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]==1.34.92
+boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]==1.34.107

requirements/dev.txt

@@ -1,6 +1,6 @@
 -r pre-dev.txt
 
-coverage==7.5.0
+coverage==7.5.1
 pytest-cov==5.0.0
 
 
@@ -11,30 +11,32 @@ mypy==1.10.0
 types-pywin32==306.0.0.20240408
 types-PyYAML==6.0.12.20240311
 types-chevron==0.14.2.20240310
-types-psutil==5.9.5.20240423
-types-setuptools==69.5.0.20240423
-types-Pygments==2.17.0.20240310 
+types-psutil==5.9.5.20240516
+types-setuptools==69.5.0.20240513
+types-Pygments==2.18.0.20240506 
 types-colorama==0.4.15.20240311
 types-dateparser==1.2.0.20240420
 types-docutils==0.21.0.20240423
-types-jsonschema==4.21.0.20240331
+types-jsonschema==4.22.0.20240501
 types-pyOpenSSL==24.1.0.20240425
 # as of types-requests>=2.31.0.7, this now requires `urllib3>2`, pin we are able to upgrade
 types-requests==2.31.0.6
 types-urllib3==1.26.25.14
 
 # Test requirements
-pytest~=8.1.1
+
+pytest==8.2.0
+
 parameterized==0.9.0
-pytest-xdist==3.5.0
+pytest-xdist==3.6.1
 pytest-forked==1.6.0
 pytest-timeout==2.3.1
 pytest-rerunfailures==14.0
 # NOTE (hawflau): DO NOT upgrade pytest-metadata and pytest-json-report unless pytest-json-report addresses https://github.com/numirias/pytest-json-report/issues/89
 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.13.4
+filelock==3.14.0
 
 # formatter
 black==24.4.2

requirements/pre-dev.txt

@@ -1 +1 @@
-ruff==0.4.2
+ruff==0.4.4