Skip to content

Commit 92f8fce

Browse files
Merge from aws/aws-sam-cli/develop
2 parents 46a3aaf + dd562b6 commit 92f8fce

26 files changed

Lines changed: 385 additions & 85 deletions

File tree

.github/workflows/build.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -197,7 +197,6 @@ jobs:
197197
run: pytest -vv ${{ matrix.tests_config.params }}
198198
env:
199199
FORCE_RUN_DOCKER_TEST: ${{ matrix.tests_config.name == 'durable-functions' && '1' || '' }}
200-
DURABLE_EXECUTIONS_EMULATOR_IMAGE_TAG: ${{ matrix.tests_config.name == 'durable-functions' && 'v1.1.1' || '' }}
201200

202201
smoke-and-functional-tests:
203202
name: ${{ matrix.tests_config.name }} / ${{ matrix.tests_config.os }} / ${{ matrix.python }}

.github/workflows/notify-slack.yml

Lines changed: 0 additions & 21 deletions
This file was deleted.

.github/workflows/pr-labeler.yml

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ jobs:
2020
runs-on: ubuntu-latest
2121
steps:
2222
- name: Apply internal/external label
23-
id: label_step
2423
uses: actions/github-script@v9
2524
with:
2625
github-token: ${{secrets.GITHUB_TOKEN}}
@@ -29,7 +28,7 @@ jobs:
2928
'aws-sam-cli-bot',
3029
'seshubaws', 'valerena',
3130
'Vandita2020', 'roger-zhangg',
32-
'vicheey', 'bnusunny', 'tobixlea',
31+
'vicheey', 'bnusunny', 'tobixlea',
3332
'reedham-aws', 'licjun', 'dependabot[bot]'
3433
];
3534
if (maintainers.includes(context.payload.sender.login)) {
@@ -39,22 +38,11 @@ jobs:
3938
repo: context.repo.repo,
4039
labels: ['pr/internal']
4140
});
42-
core.setOutput("external", "false");
4341
} else {
4442
await github.rest.issues.addLabels({
4543
issue_number: context.issue.number,
4644
owner: context.repo.owner,
4745
repo: context.repo.repo,
4846
labels: ['pr/external', 'stage/needs-triage']
4947
});
50-
core.setOutput("external", "true");
5148
}
52-
- name: Send Slack Notification for External PR
53-
if: steps.label_step.outputs.external == 'true'
54-
uses: rtCamp/action-slack-notify@e31e87e03dd19038e411e38ae27cbad084a90661 # v2
55-
env:
56-
SLACK_WEBHOOK: ${{ secrets.SLACK_WEBHOOK_URL }}
57-
SLACK_TITLE: 'PR Created: ${{ github.event.pull_request.title }} by ${{ github.event.pull_request.user.login }}'
58-
SLACK_FOOTER: ''
59-
MSG_MINIMAL: true
60-
SLACK_MESSAGE: '${{ github.event.pull_request.html_url }}'

installer/pyinstaller/build-linux.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ if [ "$python_library_zip_filename" = "" ]; then
1212
fi
1313

1414
if [ "$python_version" = "" ]; then
15-
python_version="3.11.10";
15+
python_version="3.11.15";
1616
fi
1717

1818
if [ "$openssl_version" = "" ]; then

installer/pyinstaller/build-mac.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ if [ "$openssl_version" = "" ]; then
3434
fi
3535

3636
if [ "$python_version" = "" ]; then
37-
python_version="3.11.10";
37+
python_version="3.11.15";
3838
fi
3939

4040
if ! [ "$build_binary_name" = "" ]; then

pyproject.toml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ dependencies = [
4545
"docker~=7.1.0",
4646
"dateparser~=1.3",
4747
"requests>=2.32.5,<2.35.0",
48-
"aws_lambda_builders==1.64.0",
48+
"aws_lambda_builders==1.65.0",
4949
"tomlkit==0.15.0",
5050
"watchdog==4.0.2",
5151
"rich>=14.3.3,<15.1.0",
@@ -56,29 +56,29 @@ dependencies = [
5656
# regex is not a direct dependency of SAM CLI, exclude version 2021.10.8 due to not working on M1 Mac
5757
"regex!=2021.10.8",
5858
"tzlocal==5.3.1",
59-
"cfn-lint>=1.45,<1.52",
59+
"cfn-lint>=1.51.3,<1.52",
6060
"boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]>=1.41.0",
6161
"python-dotenv>=1.0,<1.3",
6262
]
6363

6464
[project.optional-dependencies]
6565
pre-dev = [
66-
"ruff==0.15.12",
66+
"ruff==0.15.13",
6767
]
6868
dev = [
6969
"aws-sam-cli[pre-dev]",
7070
"coverage==7.14.0",
7171
"pytest-cov==7.1.0",
7272
"mypy==2.1.0",
7373
"types-pywin32==311.0.0.20260508",
74-
"types-PyYAML==6.0.12.20260510",
74+
"types-PyYAML==6.0.12.20260518",
7575
"types-chevron==0.14.2.20260408",
76-
"types-psutil==7.2.2.20260508",
76+
"types-psutil==7.2.2.20260518",
7777
"types-setuptools==82.0.0.20260508",
78-
"types-Pygments==2.20.0.20260508",
78+
"types-Pygments==2.20.0.20260518",
7979
"types-colorama==0.4.15.20260508",
8080
"types-dateparser==1.4.0.20260508",
81-
"types-docutils==0.22.3.20260508",
81+
"types-docutils==0.22.3.20260518",
8282
"types-jsonschema==4.26.0.20260508",
8383
"types-pyOpenSSL==24.1.0.20240722",
8484
"types-requests==2.33.0.20260513",
@@ -92,7 +92,7 @@ dev = [
9292
"pytest-metadata==3.1.1",
9393
"pytest-json-report-wip==1.5.1",
9494
"filelock==3.29.0",
95-
"black==26.3.1",
95+
"black==26.5.0",
9696
"psutil==7.2.2",
9797
"chardet<6",
9898
]

requirements/reproducible-linux.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ attrs==26.1.0 \
1414
# via
1515
# jsonschema
1616
# referencing
17-
aws-lambda-builders==1.64.0 \
18-
--hash=sha256:56ee91ad18a0811c94f546e1a2fe5e76ca56d77eaaf7c612a12563a5b3d5b813 \
19-
--hash=sha256:b5c045698f8bc48c25210b1f37848e57dd733c3a3d4593df6f8c10c6bd063009
17+
aws-lambda-builders==1.65.0 \
18+
--hash=sha256:31cdf9d8dccd9d729d2c7e2dd860f09d966f3c4c91ccac36b921fcf4d0b837bd \
19+
--hash=sha256:f185e07207898a1ad0f967c4f8ad67c484bf54a2c62d52a8444f88a5f8d78c48
2020
# via aws-sam-cli (pyproject.toml)
2121
aws-sam-translator==1.110.0 \
2222
--hash=sha256:466ee0e8200992c51b7fd5ede5e56ca2e8dd5473cc551e8495c14f2f4d636127 \
@@ -196,9 +196,9 @@ cffi==2.0.0 \
196196
--hash=sha256:fc7de24befaeae77ba923797c7c87834c73648a05a4bde34b3b7e5588973a453 \
197197
--hash=sha256:fe562eb1a64e67dd297ccc4f5addea2501664954f2692b69a76449ec7913ecbf
198198
# via cryptography
199-
cfn-lint==1.51.0 \
200-
--hash=sha256:05d2a59708c99363afe3af6ac7325de95a5b37f8eef7728f41ae567d088a61f1 \
201-
--hash=sha256:116d4f9c7c7d039e69c01c31fe9ff309ff79f0884c859ea92b353507903dd89e
199+
cfn-lint==1.51.4 \
200+
--hash=sha256:4897321a7d90c6e48859fde0c7c7c3c919815a947ddc85d0584dc12ad5bc544c \
201+
--hash=sha256:d37c48645e03abecfd826b8588103b06991abd838fe05c641f2853812289c021
202202
# via aws-sam-cli (pyproject.toml)
203203
charset-normalizer==3.4.7 \
204204
--hash=sha256:007d05ec7321d12a40227aae9e2bc6dca73f3cb21058999a1df9e193555a9dcc \

requirements/reproducible-mac.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ attrs==26.1.0 \
1414
# via
1515
# jsonschema
1616
# referencing
17-
aws-lambda-builders==1.64.0 \
18-
--hash=sha256:56ee91ad18a0811c94f546e1a2fe5e76ca56d77eaaf7c612a12563a5b3d5b813 \
19-
--hash=sha256:b5c045698f8bc48c25210b1f37848e57dd733c3a3d4593df6f8c10c6bd063009
17+
aws-lambda-builders==1.65.0 \
18+
--hash=sha256:31cdf9d8dccd9d729d2c7e2dd860f09d966f3c4c91ccac36b921fcf4d0b837bd \
19+
--hash=sha256:f185e07207898a1ad0f967c4f8ad67c484bf54a2c62d52a8444f88a5f8d78c48
2020
# via aws-sam-cli (pyproject.toml)
2121
aws-sam-translator==1.110.0 \
2222
--hash=sha256:466ee0e8200992c51b7fd5ede5e56ca2e8dd5473cc551e8495c14f2f4d636127 \
@@ -196,9 +196,9 @@ cffi==2.0.0 \
196196
--hash=sha256:fc7de24befaeae77ba923797c7c87834c73648a05a4bde34b3b7e5588973a453 \
197197
--hash=sha256:fe562eb1a64e67dd297ccc4f5addea2501664954f2692b69a76449ec7913ecbf
198198
# via cryptography
199-
cfn-lint==1.51.0 \
200-
--hash=sha256:05d2a59708c99363afe3af6ac7325de95a5b37f8eef7728f41ae567d088a61f1 \
201-
--hash=sha256:116d4f9c7c7d039e69c01c31fe9ff309ff79f0884c859ea92b353507903dd89e
199+
cfn-lint==1.51.4 \
200+
--hash=sha256:4897321a7d90c6e48859fde0c7c7c3c919815a947ddc85d0584dc12ad5bc544c \
201+
--hash=sha256:d37c48645e03abecfd826b8588103b06991abd838fe05c641f2853812289c021
202202
# via aws-sam-cli (pyproject.toml)
203203
charset-normalizer==3.4.7 \
204204
--hash=sha256:007d05ec7321d12a40227aae9e2bc6dca73f3cb21058999a1df9e193555a9dcc \

requirements/reproducible-win.txt

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ attrs==26.1.0 \
1414
# via
1515
# jsonschema
1616
# referencing
17-
aws-lambda-builders==1.64.0 \
18-
--hash=sha256:56ee91ad18a0811c94f546e1a2fe5e76ca56d77eaaf7c612a12563a5b3d5b813 \
19-
--hash=sha256:b5c045698f8bc48c25210b1f37848e57dd733c3a3d4593df6f8c10c6bd063009
17+
aws-lambda-builders==1.65.0 \
18+
--hash=sha256:31cdf9d8dccd9d729d2c7e2dd860f09d966f3c4c91ccac36b921fcf4d0b837bd \
19+
--hash=sha256:f185e07207898a1ad0f967c4f8ad67c484bf54a2c62d52a8444f88a5f8d78c48
2020
# via aws-sam-cli (pyproject.toml)
2121
aws-sam-translator==1.110.0 \
2222
--hash=sha256:466ee0e8200992c51b7fd5ede5e56ca2e8dd5473cc551e8495c14f2f4d636127 \
@@ -196,9 +196,9 @@ cffi==2.0.0 \
196196
--hash=sha256:fc7de24befaeae77ba923797c7c87834c73648a05a4bde34b3b7e5588973a453 \
197197
--hash=sha256:fe562eb1a64e67dd297ccc4f5addea2501664954f2692b69a76449ec7913ecbf
198198
# via cryptography
199-
cfn-lint==1.51.0 \
200-
--hash=sha256:05d2a59708c99363afe3af6ac7325de95a5b37f8eef7728f41ae567d088a61f1 \
201-
--hash=sha256:116d4f9c7c7d039e69c01c31fe9ff309ff79f0884c859ea92b353507903dd89e
199+
cfn-lint==1.51.4 \
200+
--hash=sha256:4897321a7d90c6e48859fde0c7c7c3c919815a947ddc85d0584dc12ad5bc544c \
201+
--hash=sha256:d37c48645e03abecfd826b8588103b06991abd838fe05c641f2853812289c021
202202
# via aws-sam-cli (pyproject.toml)
203203
charset-normalizer==3.4.7 \
204204
--hash=sha256:007d05ec7321d12a40227aae9e2bc6dca73f3cb21058999a1df9e193555a9dcc \

samcli/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
SAM CLI version
33
"""
44

5-
__version__ = "1.161.1"
5+
__version__ = "1.162.0"

0 commit comments

Comments
 (0)