Skip to content

Commit

Permalink
Merge branch 'aws:develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Beau-Gosse-dev authored Feb 7, 2024
2 parents f712e18 + 49c5325 commit 0c97150
Show file tree
Hide file tree
Showing 397 changed files with 3,370 additions and 1,908 deletions.
6 changes: 4 additions & 2 deletions .github/workflows/build.yml
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,9 @@ jobs:
python-version: 3.11
- run: make init
- run: |
diff <( cat schema/samcli.json ) <( python schema/make_schema.py; cat schema/samcli.json ) && exit 0 # exit if schema is unchanged
diff <( cat schema/samcli.json ) <( python -m schema.make_schema && cat schema/samcli.json ) && \
echo "No changes found." && \
exit 0 # exit if schema is unchanged
echo "The generated schema differs from that in the PR. Please run 'make schema'."
exit 1
name: Generate and compare the schema
Expand Down Expand Up @@ -143,7 +145,7 @@ jobs:
3.11
3.12
${{ matrix.python }}
- uses: actions/setup-go@v4
- uses: actions/setup-go@v5
with:
go-version: '1.19'
- uses: ruby/setup-ruby@v1
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ jobs:

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

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

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
with:
category: "/language:${{matrix.language}}"
4 changes: 2 additions & 2 deletions .github/workflows/validate_pyinstaller.yml
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ jobs:
with:
python-version: "3.8"
- name: Set up Go
uses: actions/setup-go@v4
uses: actions/setup-go@v5
with:
go-version: "1.20"
- name: Build PyInstaller
Expand All @@ -66,7 +66,7 @@ jobs:
sudo ./sam-installation/install
sam-beta --version
./tests/sanity-check.sh
- uses: actions/upload-artifact@v3
- uses: actions/upload-artifact@v4
with:
name: pyinstaller-macos-zip
path: .build/output/aws-sam-cli-macos-x86_64.zip
Expand Down
4 changes: 4 additions & 0 deletions appveyor-linux-binary.yml
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,10 @@ install:
- sh: "PATH=/opt/gradle/gradle-8.4/bin:$PATH"
- sh: "gradle --version"

# Install dotnet8 SDK
- sh: "sudo apt-get update"
- sh: "sudo apt-get install -y dotnet-sdk-8.0"

# Install AWS CLI
- sh: "virtualenv aws_cli"
- sh: "./aws_cli/bin/python -m pip install awscli"
Expand Down
4 changes: 4 additions & 0 deletions appveyor-ubuntu.yml
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,10 @@ install:
- sh: "PATH=/opt/gradle/gradle-8.4/bin:$PATH"
- sh: "gradle --version"

# Install dotnet8 SDK
- sh: "sudo apt-get update"
- sh: "sudo apt-get install -y dotnet-sdk-8.0"

# Install AWS CLI
- sh: "virtualenv aws_cli"
- sh: "./aws_cli/bin/python -m pip install awscli"
Expand Down
16 changes: 8 additions & 8 deletions requirements/base.txt
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
chevron~=0.12
click~=8.1
Flask<3.1
boto3>=1.26.109,<2
boto3>=1.29.2,<2
jmespath~=1.0.1
ruamel_yaml~=0.18.5
PyYAML~=6.0,>=6.0.1
cookiecutter~=2.5.0
aws-sam-translator==1.82.0
aws-sam-translator==1.84.0
#docker minor version updates can include breaking changes. Auto update micro version only.
docker~=6.1.0
docker~=7.0.0
dateparser~=1.2
requests~=2.31.0
aws_lambda_builders==1.43.0
aws_lambda_builders==1.45.0
tomlkit==0.12.3
watchdog==3.0.0
rich~=13.7.0
pyopenssl~=23.3.0
pyopenssl~=24.0.0
# Pin to <4.18 to until SAM-T no longer uses RefResolver
jsonschema<4.21
jsonschema<4.22

# Needed for supporting Protocol in Python 3.7, Protocol class became public with python3.8
typing_extensions>=4.4.0,<5
Expand All @@ -28,7 +28,7 @@ regex!=2021.10.8
tzlocal==5.2

#Adding cfn-lint dependency for SAM validate
cfn-lint~=0.83.5
cfn-lint~=0.85.0

# Type checking boto3 objects
boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]==1.34.0
boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]==1.34.32
30 changes: 15 additions & 15 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
@@ -1,30 +1,30 @@
-r pre-dev.txt

coverage==7.3.2
coverage==7.4.1
pytest-cov==4.1.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.7.1
types-pywin32==306.0.0.6
mypy==1.8.0
types-pywin32==306.0.0.20240130
types-PyYAML==6.0.12.12
types-chevron==0.14.2.5
types-psutil==5.9.5.17
types-setuptools==68.2.0.2
types-Pygments==2.17.0.0
types-colorama==0.4.15.12
types-dateparser==1.1.4.10
types-docutils==0.20.0.3
types-jsonschema==4.20.0.0
types-pyOpenSSL==23.3.0.0
types-chevron==0.14.2.20240106
types-psutil==5.9.5.20240205
types-setuptools==69.0.0.20240125
types-Pygments==2.17.0.20240106
types-colorama==0.4.15.20240205
types-dateparser==1.1.4.20240106
types-docutils==0.20.0.20240201
types-jsonschema==4.21.0.20240118
types-pyOpenSSL==24.0.0.20240130
# 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~=7.4.3
pytest~=7.4.4
parameterized==0.9.0
pytest-xdist==3.5.0
pytest-forked==1.6.0
Expand All @@ -36,5 +36,5 @@ pytest-json-report==1.5.0
filelock==3.13.1

# formatter
black==23.11.0
psutil==5.9.6
black==24.1.1
psutil==5.9.8
2 changes: 1 addition & 1 deletion requirements/pre-dev.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruff==0.1.8
ruff==0.2.0
4 changes: 2 additions & 2 deletions requirements/pyinstaller-build.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
# Executable binary builder requirements
setuptools==69.0.2
pyinstaller==6.2.0
setuptools==69.0.3
pyinstaller==6.3.0
Loading

0 comments on commit 0c97150

Please sign in to comment.