Skip to content

Commit 38d2277

Browse files
y-stmy-stm
authored
Merge branch 'develop' into stop-convert-windows-path-to-posix-style
2 parents fc11bf2 + f271745 commit 38d2277

File tree

7 files changed

+17
-32
lines changed

7 files changed

+17
-32
lines changed

‎.github/workflows/build.yml

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,6 @@ jobs:
5555
- ubuntu-latest
5656
- windows-latest
5757
python:
58-
- "3.8"
5958
- "3.9"
6059
- "3.11"
6160
steps:
@@ -111,8 +110,8 @@ jobs:
111110
- ubuntu-latest
112111
- windows-latest
113112
python:
114-
- "3.8"
115113
- "3.9"
114+
- "3.11"
116115
# folders that is commented below requires credentials, no need to spare time to run them
117116
tests_config:
118117
- "-n 2 --reruns 3 tests/integration/buildcmd"
@@ -138,8 +137,6 @@ jobs:
138137
with:
139138
# set last version as the one in matrix to make it default
140139
python-version: |
141-
3.7
142-
3.8
143140
3.9
144141
3.10
145142
3.11
@@ -213,7 +210,6 @@ jobs:
213210
- ubuntu-latest
214211
- windows-latest
215212
python:
216-
- "3.8"
217213
- "3.9"
218214
- "3.11"
219215
steps:
@@ -244,8 +240,6 @@ jobs:
244240
with:
245241
# These are the versions of Python that correspond to the supported Lambda runtimes
246242
python-version: |
247-
3.7
248-
3.8
249243
3.9
250244
3.10
251245
3.11

‎requirements/dev.txt

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

3-
coverage==7.6.9; python_version>="3.9"
3+
coverage==7.6.10; python_version>="3.9"
44
coverage==7.6.1; python_version<"3.9"
55
pytest-cov==6.0.0; python_version>="3.9"
66
pytest-cov==5.0.0; python_version<"3.9"
@@ -10,16 +10,16 @@ pytest-cov==5.0.0; python_version<"3.9"
1010
# mypy adds new rules in new minor versions, which could cause our PR check to fail
1111
# here we fix its version and upgrade it manually in the future
1212
mypy==1.14.1
13-
types-pywin32==308.0.0.20241128
14-
types-PyYAML==6.0.12.20240917
15-
types-chevron==0.14.2.20240310
16-
types-psutil==6.1.0.20241102
17-
types-setuptools==75.6.0.20241126
18-
types-Pygments==2.18.0.20240506
13+
types-pywin32==308.0.0.20250124
14+
types-PyYAML==6.0.12.20241230
15+
types-chevron==0.14.2.20250103
16+
types-psutil==6.1.0.20241221
17+
types-setuptools==75.8.0.20250110
18+
types-Pygments==2.19.0.20250107
1919
types-colorama==0.4.15.20240311
2020
types-dateparser==1.2.0.20240420
2121
types-docutils==0.21.0.20241128
22-
types-jsonschema==4.23.0.20240813
22+
types-jsonschema==4.23.0.20241208
2323
types-pyOpenSSL==24.1.0.20240722
2424
# lucashuy: pin `types-request` based on the Python version since newer versions of
2525
# the types require a newer version of requests, which is only installed in newer versions of Python
@@ -46,4 +46,4 @@ filelock==3.16.1
4646
# formatter
4747
black==24.10.0; python_version>="3.9"
4848
black==24.8.0; python_version<"3.9"
49-
psutil==6.1.0
49+
psutil==6.1.1

‎requirements/pre-dev.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
ruff==0.8.6
1+
ruff==0.9.2

‎tests/integration/buildcmd/test_build_cmd.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -595,7 +595,7 @@ def test_build_layer_with_architecture_not_compatible(self, build_method, use_co
595595
# Build should still succeed
596596
self.assertEqual(command_result.process.returncode, 0)
597597

598-
@parameterized.expand([("python3.8", False), ("python3.8", "use_container")])
598+
@parameterized.expand([("python3.11", False), ("python3.11", "use_container")])
599599
def test_build_arch_no_compatible_arch(self, runtime, use_container):
600600
# BuildArchitecture is present, but CompatibleArchitectures section is missing
601601
if use_container and (SKIP_DOCKER_TESTS or SKIP_DOCKER_BUILD):
@@ -621,7 +621,7 @@ def test_build_arch_no_compatible_arch(self, runtime, use_container):
621621
# Build should still succeed
622622
self.assertEqual(command_result.process.returncode, 0)
623623

624-
@parameterized.expand([("python3.8", False), ("python3.8", "use_container")])
624+
@parameterized.expand([("python3.11", False), ("python3.11", "use_container")])
625625
def test_compatible_arch_no_build_arch(self, runtime, use_container):
626626
# CompatibleArchitectures is present, but BuildArchitecture section is missing
627627
if use_container and (SKIP_DOCKER_TESTS or SKIP_DOCKER_BUILD):
@@ -691,7 +691,7 @@ def test_function_build_succeeds_with_referenced_layer(self, use_container):
691691
if use_container and (SKIP_DOCKER_TESTS or SKIP_DOCKER_BUILD):
692692
self.skipTest(SKIP_DOCKER_MESSAGE)
693693

694-
overrides = {"Runtime": "python3.8", "CodeUri": "Python"}
694+
overrides = {"Runtime": "python3.11", "CodeUri": "Python"}
695695

696696
cmdlist = self.get_command_list(
697697
use_container=use_container, parameter_overrides=overrides, function_identifier="FunctionTwo"
@@ -1123,7 +1123,7 @@ def test_no_cached_override_build(self):
11231123
"FunctionCodeUri": "Python",
11241124
"Function1Handler": "main.first_function_handler",
11251125
"Function2Handler": "main.second_function_handler",
1126-
"FunctionRuntime": "python3.8",
1126+
"FunctionRuntime": "python3.11",
11271127
}
11281128
config_file = str(Path(self.test_data_path).joinpath("samconfig_no_cached.toml"))
11291129
cmdlist = self.get_command_list(parameter_overrides=overrides, cached=True)
@@ -1161,7 +1161,7 @@ def test_cached_build_with_env_vars(self):
11611161
"FunctionCodeUri": "Python",
11621162
"Function1Handler": "main.first_function_handler",
11631163
"Function2Handler": "main.second_function_handler",
1164-
"FunctionRuntime": "python3.8",
1164+
"FunctionRuntime": "python3.11",
11651165
}
11661166
cmdlist = self.get_command_list(
11671167
use_container=True, parameter_overrides=overrides, cached=True, container_env_var="FOO=BAR"

‎tests/integration/buildcmd/test_build_cmd_arm64.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,16 @@ class TestBuildCommand_PythonFunctions_With_Specified_Architecture_arm64(BuildIn
3232

3333
@parameterized.expand(
3434
[
35-
("python3.8", "Python", False),
3635
("python3.9", "Python", False),
3736
("python3.10", "Python", False),
3837
("python3.11", "Python", False),
3938
("python3.12", "Python", False),
4039
("python3.13", "Python", False),
41-
("python3.8", "PythonPEP600", False),
4240
("python3.9", "PythonPEP600", False),
4341
("python3.10", "PythonPEP600", False),
4442
("python3.11", "PythonPEP600", False),
4543
("python3.12", "PythonPEP600", False),
4644
("python3.13", "PythonPEP600", False),
47-
("python3.8", "Python", "use_container"),
4845
("python3.9", "Python", "use_container"),
4946
("python3.10", "Python", "use_container"),
5047
("python3.11", "Python", "use_container"),

‎tests/integration/buildcmd/test_build_cmd_python.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -261,11 +261,9 @@ def test_windows_dockerfile_present_sub_dir(self, dockerfile, expected):
261261
"codeuri",
262262
),
263263
[
264-
("python3.8", "Python"),
265264
("python3.9", "Python"),
266265
("python3.10", "Python"),
267266
("python3.11", "Python"),
268-
("python3.8", "PythonPEP600"),
269267
("python3.9", "PythonPEP600"),
270268
("python3.10", "PythonPEP600"),
271269
("python3.11", "PythonPEP600"),
@@ -345,7 +343,6 @@ class TestBuildCommand_PythonFunctions_WithDocker(BuildIntegPythonBase):
345343

346344
@parameterized.expand(
347345
[
348-
("python3.8",),
349346
("python3.9",),
350347
("python3.10",),
351348
("python3.11",),
@@ -467,15 +464,12 @@ class TestBuildCommand_PythonFunctions_With_Specified_Architecture(BuildIntegPyt
467464

468465
@parameterized.expand(
469466
[
470-
("python3.8", "Python", False, "x86_64"),
471467
("python3.9", "Python", False, "x86_64"),
472468
("python3.10", "Python", False, "x86_64"),
473469
("python3.11", "Python", False, "x86_64"),
474-
("python3.8", "PythonPEP600", False, "x86_64"),
475470
("python3.9", "PythonPEP600", False, "x86_64"),
476471
("python3.10", "PythonPEP600", False, "x86_64"),
477472
("python3.11", "PythonPEP600", False, "x86_64"),
478-
("python3.8", "Python", "use_container", "x86_64"),
479473
("python3.9", "Python", "use_container", "x86_64"),
480474
("python3.10", "Python", "use_container", "x86_64"),
481475
("python3.11", "Python", "use_container", "x86_64"),

‎tests/integration/buildcmd/test_build_samconfig.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ def test_samconfig_fails_properly_with_incorrect_extension(self):
5757
]
5858
)
5959
def test_samconfig_parameters_are_overridden(self, extension):
60-
overrides = {"Runtime": "python3.8"}
60+
overrides = {"Runtime": "python3.11"}
6161
overridden_build_dir = f"override_{extension}"
6262

6363
cmdlist = self.get_command_list(

0 commit comments

Comments
 (0)