Add python3.11. (aws#473)

* Add python3.11. * fix failing without docker test cases --------- Co-authored-by: Mohamed Elasmar <71043312+moelasmar@users.noreply.github.com> Co-authored-by: Mohamed ElAsmar <melasmar@amazon.com>
moelasmar · Jul 13, 2023 · b11e95b · b11e95b
1 parent eedd1ee
commit b11e95b
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 3 deletions.
diff --git a/samcli/commands/build/command.py b/samcli/commands/build/command.py
@@ -51,7 +51,7 @@
   \b
   Supported Runtimes
   ------------------
-  1. Python 3.7, 3.8, 3.9, 3.10 using PIP\n
+  1. Python 3.7, 3.8, 3.9, 3.10, 3.11 using PIP\n
   2. Nodejs 18.x, 16.x, 14.x, 12.x using NPM\n
   3. Ruby 2.7, 3.2 using Bundler\n
   4. Java 8, Java 11, Java 17 using Gradle and Maven\n

diff --git a/samcli/lib/build/workflow_config.py b/samcli/lib/build/workflow_config.py
@@ -89,6 +89,7 @@ def get_layer_subfolder(build_workflow: str) -> str:
         "python3.8": "python",
         "python3.9": "python",
         "python3.10": "python",
+        "python3.11": "python",
         "nodejs4.3": "nodejs",
         "nodejs6.10": "nodejs",
         "nodejs8.10": "nodejs",
@@ -155,6 +156,7 @@ def get_workflow_config(
         "python3.8": BasicWorkflowSelector(PYTHON_PIP_CONFIG),
         "python3.9": BasicWorkflowSelector(PYTHON_PIP_CONFIG),
         "python3.10": BasicWorkflowSelector(PYTHON_PIP_CONFIG),
+        "python3.11": BasicWorkflowSelector(PYTHON_PIP_CONFIG),
         "nodejs12.x": BasicWorkflowSelector(NODEJS_NPM_CONFIG),
         "nodejs14.x": BasicWorkflowSelector(NODEJS_NPM_CONFIG),
         "nodejs16.x": BasicWorkflowSelector(NODEJS_NPM_CONFIG),

diff --git a/samcli/lib/utils/architecture.py b/samcli/lib/utils/architecture.py
@@ -22,6 +22,7 @@
     "python3.8": [ARM64, X86_64],
     "python3.9": [ARM64, X86_64],
     "python3.10": [ARM64, X86_64],
+    "python3.11": [ARM64, X86_64],
     "ruby2.7": [ARM64, X86_64],
     "ruby3.2": [ARM64, X86_64],
     "java8": [X86_64],

diff --git a/samcli/lib/utils/preview_runtimes.py b/samcli/lib/utils/preview_runtimes.py
@@ -4,4 +4,4 @@
 """
 from typing import Set
 
-PREVIEW_RUNTIMES: Set[str] = set()
+PREVIEW_RUNTIMES: Set[str] = {"python3.11"}
diff --git a/samcli/local/common/runtime_template.py b/samcli/local/common/runtime_template.py
@@ -16,7 +16,7 @@
 RUNTIME_DEP_TEMPLATE_MAPPING = {
     "python": [
         {
-            "runtimes": ["python3.10", "python3.9", "python3.8", "python3.7"],
+            "runtimes": ["python3.11", "python3.10", "python3.9", "python3.8", "python3.7"],
             "dependency_manager": "pip",
             "init_location": os.path.join(_templates, "cookiecutter-aws-sam-hello-python"),
             "build": True,
@@ -113,6 +113,7 @@ def get_local_lambda_images_location(mapping, runtime):
     "provided.al2",
     "provided",
     # python runtimes in descending order
+    "python3.11",
     "python3.10",
     "python3.9",
     "python3.8",
@@ -135,6 +136,7 @@ def get_local_lambda_images_location(mapping, runtime):
     "nodejs16.x": "amazon/nodejs16.x-base",
     "nodejs14.x": "amazon/nodejs14.x-base",
     "nodejs12.x": "amazon/nodejs12.x-base",
+    "python3.11": "amazon/python3.11-base",
     "python3.10": "amazon/python3.10-base",
     "python3.9": "amazon/python3.9-base",
     "python3.8": "amazon/python3.8-base",
@@ -156,6 +158,7 @@ def get_local_lambda_images_location(mapping, runtime):
     "python3.8": "Python36",
     "python3.9": "Python36",
     "python3.10": "Python36",
+    "python3.11": "Python36",
     "dotnet6": "dotnet6",
     "go1.x": "Go1",
 }

diff --git a/samcli/local/docker/lambda_debug_settings.py b/samcli/local/docker/lambda_debug_settings.py
@@ -179,6 +179,10 @@ def get_debug_settings(debug_port, debug_args_list, _container_env_vars, runtime
                 entry + ["/var/lang/bin/python3.10"] + debug_args_list + ["/var/runtime/bootstrap.py"],
                 container_env_vars=_container_env_vars,
             ),
+            Runtime.python311.value: lambda: DebugSettings(
+                entry + ["/var/lang/bin/python3.11"] + debug_args_list + ["/var/runtime/bootstrap.py"],
+                container_env_vars=_container_env_vars,
+            ),
         }
         try:
             return entrypoint_mapping[runtime]()

diff --git a/samcli/local/docker/lambda_image.py b/samcli/local/docker/lambda_image.py
@@ -40,6 +40,7 @@ class Runtime(Enum):
     python38 = "python3.8"
     python39 = "python3.9"
     python310 = "python3.10"
+    python311 = "python3.11"
     ruby27 = "ruby2.7"
     ruby32 = "ruby3.2"
     java8 = "java8"

diff --git a/tests/integration/buildcmd/test_build_cmd.py b/tests/integration/buildcmd/test_build_cmd.py
@@ -440,6 +440,7 @@ def _validate_skipped_built_function(
         ("template.yaml", "Function", True, "python3.8", "Python", False, "CodeUri"),
         ("template.yaml", "Function", True, "python3.9", "Python", False, "CodeUri"),
         ("template.yaml", "Function", True, "python3.10", "Python", False, "CodeUri"),
+        ("template.yaml", "Function", True, "python3.11", "Python", False, "CodeUri"),
         ("template.yaml", "Function", True, "python3.7", "PythonPEP600", False, "CodeUri"),
         ("template.yaml", "Function", True, "python3.8", "PythonPEP600", False, "CodeUri"),
     ],
@@ -479,6 +480,7 @@ def test_with_default_requirements(self):
         ("template.yaml", "Function", True, "python3.8", "Python", False, "CodeUri"),
         ("template.yaml", "Function", True, "python3.9", "Python", False, "CodeUri"),
         ("template.yaml", "Function", True, "python3.10", "Python", False, "CodeUri"),
+        ("template.yaml", "Function", True, "python3.11", "Python", False, "CodeUri"),
     ],
 )
 class TestBuildCommand_PythonFunctions_WithDocker(BuildIntegPythonBase):

diff --git a/tests/unit/local/docker/test_lambda_container.py b/tests/unit/local/docker/test_lambda_container.py
@@ -23,6 +23,7 @@
     Runtime.python38.value,
     Runtime.python39.value,
     Runtime.python310.value,
+    Runtime.python311.value,
     Runtime.dotnet6.value,
 ]
 

diff --git a/tests/unit/local/docker/test_lambda_debug_settings.py b/tests/unit/local/docker/test_lambda_debug_settings.py
@@ -20,6 +20,7 @@
     Runtime.python38,
     Runtime.python39,
     Runtime.python310,
+    Runtime.python311,
 ]