Merge branch 'develop' into remove-python-38

Author: mbfreder

requirements/dev.txt

@@ -9,14 +9,14 @@ pytest-cov==5.0.0; python_version<"3.9"
 # 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.14.1
-types-pywin32==308.0.0.20250128; python_version>="3.9"
+mypy==1.15.0
+types-pywin32==309.0.0.20250311; python_version>="3.9"
 types-pywin32==308.0.0.20241221; python_version<"3.9"
 types-PyYAML==6.0.12.20241230
 types-chevron==0.14.2.20250103
 types-psutil==7.0.0.20250218
-types-setuptools==75.8.0.20250210
-types-Pygments==2.19.0.20250219 
+types-setuptools==76.0.0.20250313
+types-Pygments==2.19.0.20250305 
 types-colorama==0.4.15.20240311
 types-dateparser==1.2.0.20250208
 types-docutils==0.21.0.20241128
@@ -25,12 +25,12 @@ 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.20241016; python_version>="3.10"
+types-requests==2.32.0.20250306; python_version>="3.10"
 types-urllib3==1.26.25.14
 
 # Test requirements
 
-pytest==8.3.4
+pytest==8.3.5
 
 parameterized==0.9.0
 pytest-xdist==3.6.1
@@ -42,7 +42,7 @@ pytest-rerunfailures==14.0;  python_version<"3.9"
 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.17.0;  python_version>="3.9"
+filelock==3.18.0;  python_version>="3.9"
 filelock==3.16.1;  python_version<"3.9"
 
 # formatter

requirements/pre-dev.txt

@@ -1 +1 @@
-ruff==0.9.7
+ruff==0.9.9

samcli/__init__.py

@@ -2,4 +2,4 @@
 SAM CLI version
 """
 
-__version__ = "1.134.0"
+__version__ = "1.135.0"

samcli/lib/utils/tar.py

@@ -8,7 +8,7 @@
 from contextlib import contextmanager
 from pathlib import Path
 from tempfile import TemporaryFile
-from typing import IO, Callable, Dict, List, Optional, Union
+from typing import IO, Callable, Dict, List, Literal, Optional, Union
 
 LOG = logging.getLogger(__name__)
 
@@ -17,7 +17,7 @@
 def create_tarball(
     tar_paths: Dict[Union[str, Path], str],
     tar_filter: Optional[Callable[[tarfile.TarInfo], Union[None, tarfile.TarInfo]]] = None,
-    mode: str = "w",
+    mode: Literal["x", "x:", "a", "a:", "w", "w:", "w:tar"] = "w",
     dereference: bool = False,
 ):
     """

tests/integration/testdata/buildcmd/Ruby/.ruby-version

@@ -1 +1 @@
-3.2.4
+3.2.7

tests/integration/testdata/buildcmd/Ruby32/.ruby-version

@@ -1 +1 @@
-3.2.4
+3.2.7

tests/integration/testdata/buildcmd/Ruby33/.ruby-version

@@ -1 +1 @@
-3.3.4
+3.3.7

tests/integration/testdata/buildcmd/terraform/build_image_docker/Dockerfile

@@ -1,21 +1,29 @@
-FROM public.ecr.aws/amazonlinux/amazonlinux:2023
+FROM public.ecr.aws/amazonlinux/amazonlinux:2
 
 RUN yum -y update \
-    && yum install -y unzip tar gzip ed less \
+    && yum install -y unzip tar gzip ed less wget \
     && rm -rf /var/cache/yum
 
-RUN yum -y install make \
-    && yum -y install zip
+RUN yum -y groupinstall "Development Tools"
+
+RUN yum -y install openssl-devel bzip2-devel libffi-devel
 
 RUN yum install -y yum-utils \
     && yum-config-manager --add-repo https://rpm.releases.hashicorp.com/AmazonLinux/hashicorp.repo \
     && yum -y install terraform \
     && terraform --version
 
 # AWS Lambda Builders
-# AL2023 uses Python3.9 by default. This might fail in the future if that changes. We just need the proper version
-RUN curl -L get-pip.io | python3.9
-RUN pip3 install aws-lambda-builders
+RUN cd /tmp \
+    && wget https://www.python.org/ftp/python/3.9.17/Python-3.9.17.tgz \
+    && tar xvf Python-3.9.17.tgz \
+    && cd Python-3.9.17 \
+    && ./configure --enable-optimizations \
+    && make install
+
+RUN python3 -m ensurepip
+RUN python3 -m pip install --upgrade pip
+RUN python3 -m pip install aws-lambda-builders
 RUN python3 --version
 
 VOLUME /project

tests/integration/testdata/sync/infra/after/Ruby/function/.ruby-version

@@ -1 +1 @@
-3.2.4
+3.2.7

tests/integration/testdata/sync/infra/after/Ruby/layer/.ruby-version

@@ -1 +1 @@
-3.2.4
+3.2.7