Skip to content

Commit

Permalink
Merge branch 'develop' into dependabot/pip/requirements/develop/setup…
Browse files Browse the repository at this point in the history
…tools-74.0.0
  • Loading branch information
hnnasit authored Sep 12, 2024
2 parents 566285b + 4a7a900 commit 538fb71
Show file tree
Hide file tree
Showing 10 changed files with 687 additions and 713 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/update-reproducibles.yml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ jobs:
python: 3.8
target: update-reproducible-mac-reqs
- os: windows-latest
python: 3.11
python: 3.12
target: update-reproducible-win-reqs
max-parallel: 1
runs-on: ${{ matrix.os }}
Expand Down
2 changes: 1 addition & 1 deletion installer/pyinstaller/build-linux.sh
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ if [ "$python_library_zip_filename" = "" ]; then
fi

if [ "$python_version" = "" ]; then
python_version="3.11.8";
python_version="3.11.10";
fi

if [ "$openssl_version" = "" ]; then
Expand Down
2 changes: 1 addition & 1 deletion installer/pyinstaller/build-mac.sh
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ if [ "$openssl_version" = "" ]; then
fi

if [ "$python_version" = "" ]; then
python_version="3.8.13";
python_version="3.8.20";
fi

if ! [ "$build_binary_name" = "" ]; then
Expand Down
6 changes: 3 additions & 3 deletions requirements/base.txt
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ requests~=2.32.3
aws_lambda_builders==1.50.0
tomlkit==0.13.2
watchdog==4.0.2
rich~=13.8.0
rich~=13.8.1
pyopenssl~=24.2.1
# Pin to <4.18 to until SAM-T no longer uses RefResolver
jsonschema<4.24
Expand All @@ -28,7 +28,7 @@ regex!=2021.10.8
tzlocal==5.2

#Adding cfn-lint dependency for SAM validate
cfn-lint~=1.11.0
cfn-lint~=1.12.4

# Type checking boto3 objects
boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]==1.35.8
boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]==1.35.14
10 changes: 5 additions & 5 deletions requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,18 @@ mypy==1.11.2
types-pywin32==306.0.0.20240822
types-PyYAML==6.0.12.20240808
types-chevron==0.14.2.20240310
types-psutil==6.0.0.20240621
types-setuptools==73.0.0.20240822
types-psutil==6.0.0.20240901
types-setuptools==74.1.0.20240907
types-Pygments==2.18.0.20240506
types-colorama==0.4.15.20240311
types-dateparser==1.2.0.20240420
types-docutils==0.21.0.20240724
types-docutils==0.21.0.20240907
types-jsonschema==4.23.0.20240813
types-pyOpenSSL==24.1.0.20240722
# lucashuy: pin `types-request` based on the Python version since newer versions of
# the types require a newer version of requests, which is only installed in newer versions of Python
types-requests==2.31.0.6; python_version<"3.10"
types-requests==2.32.0.20240712; python_version>="3.10"
types-requests==2.32.0.20240907; python_version>="3.10"
types-urllib3==1.26.25.14

# Test requirements
Expand All @@ -38,7 +38,7 @@ pytest-rerunfailures==14.0
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.15.4
filelock==3.16.0

# formatter
black==24.8.0
Expand Down
2 changes: 1 addition & 1 deletion requirements/pre-dev.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
ruff==0.6.2
ruff==0.6.4
447 changes: 223 additions & 224 deletions requirements/reproducible-linux.txt

Large diffs are not rendered by default.

443 changes: 219 additions & 224 deletions requirements/reproducible-mac.txt

Large diffs are not rendered by default.

484 changes: 232 additions & 252 deletions requirements/reproducible-win.txt

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion samcli/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
SAM CLI version
"""

__version__ = "1.123.0"
__version__ = "1.124.0"

0 comments on commit 538fb71

Please sign in to comment.