Merge branch 'develop' into add-docker-build-logs

.github/workflows/update-reproducibles.yml

@@ -22,7 +22,7 @@ jobs:
             python: 3.11
             target: update-reproducible-linux-reqs
           - os: macos-latest
-            python: 3.8
+            python: 3.11
             target: update-reproducible-mac-reqs
           - os: windows-latest
             python: 3.12

Makefile

@@ -58,19 +58,17 @@ schema:
 # Verifications to run before sending a pull request
 pr: init dev schema black-check
 
-# (jfuss) We updated to have two requirement files, one for mac and one for linux. This
-# is meant to be a short term fix when upgrading the Linux installer to be python3.11 from 
-# python3.7. Having different requirements is not ideal but this allows us to isolate changes
-# giving us the ability to roll out upgrade to Linux first. When we update the MacOS installer
-# we can move to a single file again.
+# lucashuy: Linux and MacOS are on the same Python version,
+# however we should follow up in a different change
+# to consider combining these files again
 update-reproducible-linux-reqs:
 	python3.11 -m venv venv-update-reproducible-linux
 	venv-update-reproducible-linux/bin/pip install --upgrade pip-tools pip
 	venv-update-reproducible-linux/bin/pip install -r requirements/base.txt
 	venv-update-reproducible-linux/bin/pip-compile --generate-hashes --allow-unsafe -o requirements/reproducible-linux.txt
 
 update-reproducible-mac-reqs:
-	python3.8 -m venv venv-update-reproducible-mac
+	python3.11 -m venv venv-update-reproducible-mac
 	venv-update-reproducible-mac/bin/pip install --upgrade pip-tools pip
 	venv-update-reproducible-mac/bin/pip install -r requirements/base.txt
 	venv-update-reproducible-mac/bin/pip-compile --generate-hashes --allow-unsafe -o requirements/reproducible-mac.txt

installer/pyinstaller/build-mac.sh

@@ -34,7 +34,7 @@ if [ "$openssl_version" = "" ]; then
 fi
 
 if [ "$python_version" = "" ]; then
-    python_version="3.8.20";
+    python_version="3.11.10";
 fi
 
 if ! [ "$build_binary_name" = "" ]; then
@@ -100,7 +100,7 @@ sudo make -j8 install
 cd ..
 
 echo "Installing Python Libraries"
-/usr/local/bin/python3.8 -m venv venv
+/usr/local/bin/python3.11 -m venv venv
 ./venv/bin/pip install --upgrade pip
 ./venv/bin/pip install -r src/requirements/reproducible-mac.txt
 

requirements/base.txt

@@ -11,7 +11,7 @@ aws-sam-translator==1.94.0
 docker~=7.1.0
 dateparser~=1.2
 requests~=2.32.3
-aws_lambda_builders==1.52.0
+aws_lambda_builders==1.53.0
 tomlkit==0.13.2
 # NOTE: For supporting watchdog in Python3.8, version is pinned to 4.0.2 as 
 # version 5.0.2 introduced some breaking changes for versions > Python3.8
@@ -31,7 +31,7 @@ regex!=2021.10.8
 tzlocal==5.2
 
 #Adding cfn-lint dependency for SAM validate
-cfn-lint~=1.20.0
+cfn-lint~=1.20.1
 
 # Type checking boto3 objects
 boto3-stubs[apigateway,cloudformation,ecr,iam,lambda,s3,schemas,secretsmanager,signer,stepfunctions,sts,xray,sqs,kinesis]==1.35.63

requirements/dev.txt

@@ -1,6 +1,6 @@
 -r pre-dev.txt
 
-coverage==7.6.7; python_version>="3.9"
+coverage==7.6.8; python_version>="3.9"
 coverage==7.6.1; python_version<"3.9"
 pytest-cov==6.0.0; python_version>="3.9"
 pytest-cov==5.0.0; python_version<"3.9"
@@ -10,15 +10,15 @@ pytest-cov==5.0.0; python_version<"3.9"
 # 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.13.0
-types-pywin32==308.0.0.20241121
+types-pywin32==308.0.0.20241128
 types-PyYAML==6.0.12.20240917
 types-chevron==0.14.2.20240310
 types-psutil==6.1.0.20241102
-types-setuptools==75.5.0.20241122
+types-setuptools==75.6.0.20241126
 types-Pygments==2.18.0.20240506 
 types-colorama==0.4.15.20240311
 types-dateparser==1.2.0.20240420
-types-docutils==0.21.0.20241005
+types-docutils==0.21.0.20241128
 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

samcli/commands/_utils/options.py

@@ -849,8 +849,10 @@ def resolve_image_repos_option(f):
 
 def use_container_build_click_option():
     return click.option(
-        "--use-container",
+        "--use-container/--no-use-container",
         "-u",
+        required=False,
+        default=False,
         is_flag=True,
         help="Build functions within an AWS Lambda-like container.",
     )

samcli/runtime_config.json

@@ -1,3 +1,3 @@
 {
-    "app_template_repo_commit": "e9255c4b848b523ca903e5ee0fbd28d52f2a4c4e"
+    "app_template_repo_commit": "4801f61b2288fa85f2e06cf5c1a8d8dbe22094cb"
 }