Skip to content

Commit 0d1797b

Browse files
aws-sam-cli-botaws-sam-cli-bot
authored
Merge from aws/aws-sam-cli/develop
2 parents 809e5ab + b5503ae commit 0d1797b

File tree

43 files changed

+979
-641
lines changed

Some content is hidden

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

43 files changed

+979
-641
lines changed

‎.github/labeler.yml‎

Lines changed: 76 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,75 +1,109 @@
11
area/package:
2-
- samcli/commands/package/*
3-
- samcli/commands/package/**/*
2+
- changed-files:
3+
- any-glob-to-any-file:
4+
- samcli/commands/package/*
5+
- samcli/commands/package/**/*
46

57
area/local/invoke:
6-
- samcli/commands/local/invoke/*
7-
- samcli/commands/local/invoke/**/*
8-
- samcli/local/*
9-
- samcli/local/**/*
8+
- changed-files:
9+
- any-glob-to-any-file:
10+
- samcli/commands/local/invoke/*
11+
- samcli/commands/local/invoke/**/*
12+
- samcli/local/*
13+
- samcli/local/**/*
1014

1115
area/pipeline:
12-
- samcli/commands/pipeline/*
13-
- samcli/commands/pipeline/**/*
16+
- changed-files:
17+
- any-glob-to-any-file:
18+
- samcli/commands/pipeline/*
19+
- samcli/commands/pipeline/**/*
1420

1521
area/deploy:
16-
- samcli/commands/deploy/*
17-
- samcli/commands/deploy/**/*
22+
- changed-files:
23+
- any-glob-to-any-file:
24+
- samcli/commands/deploy/*
25+
- samcli/commands/deploy/**/*
1826

1927
area/local/start-api:
20-
- samcli/commands/local/start-api/*
21-
- samcli/commands/local/start-api/**/*
22-
- samcli/local/*
23-
- samcli/local/**/*
28+
- changed-files:
29+
- any-glob-to-any-file:
30+
- samcli/commands/local/start-api/*
31+
- samcli/commands/local/start-api/**/*
32+
- samcli/local/*
33+
- samcli/local/**/*
2434

2535
area/local/start-invoke:
26-
- samcli/commands/local/start-invoke/*
27-
- samcli/commands/local/start-invoke/**/*
28-
- samcli/local/*
29-
- samcli/local/**/*
36+
- changed-files:
37+
- any-glob-to-any-file:
38+
- samcli/commands/local/start-invoke/*
39+
- samcli/commands/local/start-invoke/**/*
40+
- samcli/local/*
41+
- samcli/local/**/*
3042

3143
area/local/generate-event:
32-
- samcli/commands/local/generate-event/*
33-
- samcli/commands/local/generate-event/**/*
44+
- changed-files:
45+
- any-glob-to-any-file:
46+
- samcli/commands/local/generate-event/*
47+
- samcli/commands/local/generate-event/**/*
3448

3549
area/init:
36-
- samcli/commands/init/*
37-
- samcli/commands/init/**/*
50+
- changed-files:
51+
- any-glob-to-any-file:
52+
- samcli/commands/init/*
53+
- samcli/commands/init/**/*
3854

3955
area/delete:
40-
- samcli/commands/delete/*
41-
- samcli/commands/delete/**/*
56+
- changed-files:
57+
- any-glob-to-any-file:
58+
- samcli/commands/delete/*
59+
- samcli/commands/delete/**/*
4260

4361
area/integration-tests:
44-
- test/integration/*
45-
- test/integration/**/*
62+
- changed-files:
63+
- any-glob-to-any-file:
64+
- test/integration/*
65+
- test/integration/**/*
4666

4767
area/publish:
48-
- samcli/commands/publish/*
49-
- samcli/commands/publish/**/*
68+
- changed-files:
69+
- any-glob-to-any-file:
70+
- samcli/commands/publish/*
71+
- samcli/commands/publish/**/*
5072

5173
area/sync:
52-
- samcli/commands/sync/*
53-
- samcli/commands/sync/**/*
74+
- changed-files:
75+
- any-glob-to-any-file:
76+
- samcli/commands/sync/*
77+
- samcli/commands/sync/**/*
5478

5579
area/validate:
56-
- samcli/commands/validate/*
57-
- samcli/commands/validate/**/*
80+
- changed-files:
81+
- any-glob-to-any-file:
82+
- samcli/commands/validate/*
83+
- samcli/commands/validate/**/*
5884

5985
area/build:
60-
- samcli/commands/build/*
61-
- samcli/commands/build/**/*
62-
- samcli/lib/build/*
63-
- samcli/lib/build/**/*
86+
- changed-files:
87+
- any-glob-to-any-file:
88+
- samcli/commands/build/*
89+
- samcli/commands/build/**/*
90+
- samcli/lib/build/*
91+
- samcli/lib/build/**/*
6492

6593
area/logs:
66-
- samcli/commands/logs/*
67-
- samcli/commands/logs/**/*
94+
- changed-files:
95+
- any-glob-to-any-file:
96+
- samcli/commands/logs/*
97+
- samcli/commands/logs/**/*
6898

6999
area/traces:
70-
- samcli/commands/traces/*
71-
- samcli/commands/traces/**/*
100+
- changed-files:
101+
- any-glob-to-any-file:
102+
- samcli/commands/traces/*
103+
- samcli/commands/traces/**/*
72104

73105
area/schema:
74-
- schema/*
75-
- schema/**/*
106+
- changed-files:
107+
- any-glob-to-any-file:
108+
- schema/*
109+
- schema/**/*

‎.github/workflows/build.yml‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ jobs:
6060
- "3.11"
6161
steps:
6262
- uses: actions/checkout@v4
63-
- uses: actions/setup-python@v4
63+
- uses: actions/setup-python@v5
6464
with:
6565
python-version: ${{ matrix.python }}
6666
- run: test -f "./.github/ISSUE_TEMPLATE/Bug_report.md" # prevent Bug_report.md from being renamed or deleted
@@ -76,13 +76,15 @@ jobs:
7676
runs-on: ubuntu-latest
7777
steps:
7878
- uses: actions/checkout@v4
79-
- uses: actions/setup-python@v4
79+
- uses: actions/setup-python@v5
8080
name: Install Python 3.11
8181
with:
8282
python-version: 3.11
8383
- run: make init
8484
- run: |
85-
diff <( cat schema/samcli.json ) <( python schema/make_schema.py; cat schema/samcli.json ) && exit 0 # exit if schema is unchanged
85+
diff <( cat schema/samcli.json ) <( python -m schema.make_schema && cat schema/samcli.json ) && \
86+
echo "No changes found." && \
87+
exit 0 # exit if schema is unchanged
8688
echo "The generated schema differs from that in the PR. Please run 'make schema'."
8789
exit 1
8890
name: Generate and compare the schema
@@ -132,7 +134,7 @@ jobs:
132134
- "tests/integration/docs"
133135
steps:
134136
- uses: actions/checkout@v4
135-
- uses: actions/setup-python@v4
137+
- uses: actions/setup-python@v5
136138
with:
137139
# set last version as the one in matrix to make it default
138140
python-version: |
@@ -218,7 +220,7 @@ jobs:
218220
- "3.11"
219221
steps:
220222
- uses: actions/checkout@v4
221-
- uses: actions/setup-python@v4
223+
- uses: actions/setup-python@v5
222224
with:
223225
python-version: ${{ matrix.python }}
224226
- name: Init samdev
@@ -240,7 +242,7 @@ jobs:
240242
- windows-latest
241243
steps:
242244
- uses: actions/checkout@v4
243-
- uses: actions/setup-python@v4
245+
- uses: actions/setup-python@v5
244246
with:
245247
# These are the versions of Python that correspond to the supported Lambda runtimes
246248
python-version: |

‎.github/workflows/codeql.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ jobs:
4646

4747
# Initializes the CodeQL tools for scanning.
4848
- name: Initialize CodeQL
49-
uses: github/codeql-action/init@v2
49+
uses: github/codeql-action/init@v3
5050
with:
5151
languages: ${{ matrix.language }}
5252
# If you wish to specify custom queries, you can do so here or in a config file.
@@ -60,7 +60,7 @@ jobs:
6060
# Autobuild attempts to build any compiled languages (C/C++, C#, Go, or Java).
6161
# If this step fails, then you should remove it and run the build manually (see below)
6262
- name: Autobuild
63-
uses: github/codeql-action/autobuild@v2
63+
uses: github/codeql-action/autobuild@v3
6464

6565
# ℹ️ Command-line programs to run using the OS shell.
6666
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
@@ -73,6 +73,6 @@ jobs:
7373
# ./location_of_script_within_repo/buildscript.sh
7474

7575
- name: Perform CodeQL Analysis
76-
uses: github/codeql-action/analyze@v2
76+
uses: github/codeql-action/analyze@v3
7777
with:
7878
category: "/language:${{matrix.language}}"

‎.github/workflows/pr-labeler.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ jobs:
99
pull-requests: write
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/labeler@v4
12+
- uses: actions/labeler@v5
1313
with:
1414
repo-token: "${{ secrets.GITHUB_TOKEN }}"
1515
apply-internal-external-label:

‎.github/workflows/update-reproducibles.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ jobs:
3333
- uses: actions/checkout@v4
3434
with:
3535
ref: ${{ github.head_ref }}
36-
- uses: actions/setup-python@v4
36+
- uses: actions/setup-python@v5
3737
with:
3838
python-version: ${{ matrix.python }}
3939
- run: make ${{ matrix.target }}

‎.github/workflows/validate_pyinstaller.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ jobs:
4949
fail-fast: false
5050
steps:
5151
- uses: actions/checkout@v4
52-
- uses: actions/setup-python@v4
52+
- uses: actions/setup-python@v5
5353
with:
5454
python-version: "3.8"
5555
- name: Set up Go

‎appveyor-linux-binary.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,10 @@ install:
6767
- sh: "PATH=/opt/gradle/gradle-8.4/bin:$PATH"
6868
- sh: "gradle --version"
6969

70+
# Install dotnet8 SDK
71+
- sh: "sudo apt-get update"
72+
- sh: "sudo apt-get install -y dotnet-sdk-8.0"
73+
7074
# Install AWS CLI
7175
- sh: "virtualenv aws_cli"
7276
- sh: "./aws_cli/bin/python -m pip install awscli"

‎appveyor-ubuntu.yml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,10 @@ install:
6868
- sh: "PATH=/opt/gradle/gradle-8.4/bin:$PATH"
6969
- sh: "gradle --version"
7070

71+
# Install dotnet8 SDK
72+
- sh: "sudo apt-get update"
73+
- sh: "sudo apt-get install -y dotnet-sdk-8.0"
74+
7175
# Install AWS CLI
7276
- sh: "virtualenv aws_cli"
7377
- sh: "./aws_cli/bin/python -m pip install awscli"

‎requirements/base.txt‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
chevron~=0.12
22
click~=8.1
33
Flask<3.1
4-
boto3>=1.26.109,<2
4+
boto3>=1.29.2,<2
55
jmespath~=1.0.1
66
ruamel_yaml~=0.18.5
77
PyYAML~=6.0,>=6.0.1
@@ -11,7 +11,7 @@ aws-sam-translator==1.82.0
1111
docker~=6.1.0
1212
dateparser~=1.2
1313
requests~=2.31.0
14-
aws_lambda_builders==1.43.0
14+
aws_lambda_builders==1.45.0
1515
tomlkit==0.12.3
1616
watchdog==3.0.0
1717
rich~=13.7.0
@@ -28,7 +28,7 @@ regex!=2021.10.8
2828
tzlocal==5.2
2929

3030
#Adding cfn-lint dependency for SAM validate
31-
cfn-lint~=0.83.4
31+
cfn-lint~=0.83.5
3232

3333
# Type checking boto3 objects
34-
boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]==1.33.5
34+
boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]==1.34.9

‎requirements/dev.txt‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
-r pre-dev.txt
22

3-
coverage==7.3.2
3+
coverage==7.4.0
44
pytest-cov==4.1.0
55

66

77
# type checking and related stubs
88
# mypy adds new rules in new minor versions, which could cause our PR check to fail
99
# here we fix its version and upgrade it manually in the future
1010
mypy==1.7.1
11-
types-pywin32==306.0.0.6
11+
types-pywin32==306.0.0.8
1212
types-PyYAML==6.0.12.12
1313
types-chevron==0.14.2.5
1414
types-psutil==5.9.5.17
15-
types-setuptools==68.2.0.2
15+
types-setuptools==69.0.0.0
1616
types-Pygments==2.17.0.0
1717
types-colorama==0.4.15.12
1818
types-dateparser==1.1.4.10
@@ -36,5 +36,5 @@ pytest-json-report==1.5.0
3636
filelock==3.13.1
3737

3838
# formatter
39-
black==23.11.0
40-
psutil==5.9.6
39+
black==23.12.0
40+
psutil==5.9.7

0 commit comments

Comments
 (0)