Skip to content

Commit bd7404d

Browse files
authored
Merge branch 'develop' into feature/serverless-rules-lint
2 parents 3f44d85 + 47e7752 commit bd7404d

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+97
-77
lines changed

appveyor-windows-al2023.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ install:
5454
# Make sure the temp directory exists for Python to use.
5555
- ps: "mkdir -Force C:\\tmp"
5656
- "python --version"
57-
- 'set PATH=%PYTHON_HOME%;C:\Ruby33-x64\bin;C:\Ruby32-x64\bin;%PATH%;C:\Python39-x64;C:\Python310-x64;C:\Python311-x64;C:\Python312-x64;C:\Python313-x64'
57+
- 'set PATH=%PYTHON_HOME%;C:\Ruby33-x64\bin;%PATH%;C:\Python39-x64;C:\Python310-x64;C:\Python311-x64;C:\Python312-x64;C:\Python313-x64'
5858
- "node --version"
5959
- "echo %PYTHON_HOME%"
6060
- "echo %PATH%"

appveyor-windows-binary.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@ install:
6464
- "gradle -v"
6565
- "mvn --version"
6666
- choco install ruby --version=3.3.0.1
67+
- choco install ruby --version=3.4.2.1
6768

6869
# Make sure the temp directory exists for Python to use.
6970
- ps: "mkdir -Force C:\\tmp"

appveyor-windows.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,6 @@ install:
6262
- choco upgrade gradle --version=8.4.0
6363
- "gradle -v"
6464
- "mvn --version"
65-
- choco install ruby --version=3.3.0.1
6665

6766
# Make sure the temp directory exists for Python to use.
6867
- ps: "mkdir -Force C:\\tmp"

requirements/base.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ regex!=2021.10.8
3131
tzlocal==5.2
3232

3333
#Adding cfn-lint dependency for SAM validate
34-
cfn-lint~=1.32.3
34+
cfn-lint~=1.34.1
3535

3636
# Type checking boto3 objects
3737
boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]==1.35.71

requirements/dev.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ types-pywin32==308.0.0.20241221; python_version<"3.9"
1515
types-PyYAML==6.0.12.20250402
1616
types-chevron==0.14.2.20250103
1717
types-psutil==7.0.0.20250401
18-
types-setuptools==78.1.0.20250329
18+
types-setuptools==79.0.0.20250422
1919
types-Pygments==2.19.0.20250305
2020
types-colorama==0.4.15.20240311
2121
types-dateparser==1.2.0.20250408
@@ -46,6 +46,6 @@ filelock==3.18.0; python_version>="3.9"
4646
filelock==3.16.1; python_version<"3.9"
4747

4848
# formatter
49-
black==24.10.0; python_version>="3.9"
49+
black==25.1.0; python_version>="3.9"
5050
black==24.8.0; python_version<"3.9"
5151
psutil==7.0.0

requirements/pyinstaller-build.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
# Executable binary builder requirements
22
setuptools==75.6.0
3-
pyinstaller==6.12.0
3+
pyinstaller==6.13.0

requirements/reproducible-linux.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,9 @@ cffi==1.17.1 \
129129
--hash=sha256:f7f5baafcc48261359e14bcd6d9bff6d4b28d9103847c9e136694cb0501aef87 \
130130
--hash=sha256:fc48c783f9c87e60831201f2cce7f3b2e4846bf4d8728eabe54d60700b318a0b
131131
# via cryptography
132-
cfn-lint==1.32.3 \
133-
--hash=sha256:94ec87e9186dc2cd7d718eb14b4330cbc77889753310fa35600d8c94470bf8d5 \
134-
--hash=sha256:a5723e7c7ef537d70b098d43f42f9670ea9856cb21d1699efd7fd9e3aaab26c1
132+
cfn-lint==1.34.1 \
133+
--hash=sha256:2c21a908fa5d9b0c1caac2081c10261eaae7fce88364e4edc607717892f36d68 \
134+
--hash=sha256:58f4352c370a710b72b389eda0acd6762e62f926e534d2eb1609d5326ded4bed
135135
# via aws-sam-cli (setup.py)
136136
chardet==5.2.0 \
137137
--hash=sha256:1b3b6ff479a8c414bc3fa2c0852995695c4a026dcd6d0633b2dd092ca39c1cf7 \

requirements/reproducible-mac.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,9 @@ cffi==1.17.1 \
129129
--hash=sha256:f7f5baafcc48261359e14bcd6d9bff6d4b28d9103847c9e136694cb0501aef87 \
130130
--hash=sha256:fc48c783f9c87e60831201f2cce7f3b2e4846bf4d8728eabe54d60700b318a0b
131131
# via cryptography
132-
cfn-lint==1.32.3 \
133-
--hash=sha256:94ec87e9186dc2cd7d718eb14b4330cbc77889753310fa35600d8c94470bf8d5 \
134-
--hash=sha256:a5723e7c7ef537d70b098d43f42f9670ea9856cb21d1699efd7fd9e3aaab26c1
132+
cfn-lint==1.34.1 \
133+
--hash=sha256:2c21a908fa5d9b0c1caac2081c10261eaae7fce88364e4edc607717892f36d68 \
134+
--hash=sha256:58f4352c370a710b72b389eda0acd6762e62f926e534d2eb1609d5326ded4bed
135135
# via aws-sam-cli (setup.py)
136136
chardet==5.2.0 \
137137
--hash=sha256:1b3b6ff479a8c414bc3fa2c0852995695c4a026dcd6d0633b2dd092ca39c1cf7 \

requirements/reproducible-win.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -129,9 +129,9 @@ cffi==1.17.1 \
129129
--hash=sha256:f7f5baafcc48261359e14bcd6d9bff6d4b28d9103847c9e136694cb0501aef87 \
130130
--hash=sha256:fc48c783f9c87e60831201f2cce7f3b2e4846bf4d8728eabe54d60700b318a0b
131131
# via cryptography
132-
cfn-lint==1.32.3 \
133-
--hash=sha256:94ec87e9186dc2cd7d718eb14b4330cbc77889753310fa35600d8c94470bf8d5 \
134-
--hash=sha256:a5723e7c7ef537d70b098d43f42f9670ea9856cb21d1699efd7fd9e3aaab26c1
132+
cfn-lint==1.34.1 \
133+
--hash=sha256:2c21a908fa5d9b0c1caac2081c10261eaae7fce88364e4edc607717892f36d68 \
134+
--hash=sha256:58f4352c370a710b72b389eda0acd6762e62f926e534d2eb1609d5326ded4bed
135135
# via aws-sam-cli (setup.py)
136136
chardet==5.2.0 \
137137
--hash=sha256:1b3b6ff479a8c414bc3fa2c0852995695c4a026dcd6d0633b2dd092ca39c1cf7 \

samcli/hook_packages/terraform/copy_terraform_built_artifacts.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
"""
2-
Python script that prepares artifacts for SAM CLI to invoke.
2+
Python script that prepares artifacts for SAM CLI to invoke.
33
This script will work in both Linux/MacOS and Windows.
44
55
It consists of 5 steps:
66
1. create a temporary TF backend (create_backend_override)
77
2. run `terraform init -reconfigure`
88
3. run `terraform apply` on the SAM CLI Metadata resource
99
4. run `terraform out` to produce an output
10-
5. parse the output to locate the built artifact, and move it to the SAM CLI
10+
5. parse the output to locate the built artifact, and move it to the SAM CLI
1111
build artifact directory (find_and_copy_assets)
1212
1313
Note: This script intentionally does not use Python3 specific syntax.

0 commit comments

Comments
 (0)