chore misc formatting

Author: reedham-aws

samcli/commands/build/build_context.py

@@ -700,15 +700,18 @@ def _check_build_method_experimental_flag(self) -> None:
         """
         Prints warning message and confirms if user wants to use beta feature
         """
-        EXPERIMENTAL_BUILD_METHODS = { "rust-cargolambda": ExperimentalFlag.RustCargoLambda, "python-uv": ExperimentalFlag.UvPackageManager }
+        EXPERIMENTAL_BUILD_METHODS = {
+            "rust-cargolambda": ExperimentalFlag.RustCargoLambda,
+            "python-uv": ExperimentalFlag.UvPackageManager,
+        }
 
         resources_to_build = self.get_resources_to_build()
         for function in resources_to_build.functions:
             if function.metadata and function.metadata.get("BuildMethod", "") in EXPERIMENTAL_BUILD_METHODS:
                 build_method = function.metadata.get("BuildMethod", "")
                 WARNING_MESSAGE = (
                     f'Build method "{build_method}" is a beta feature.\n'
-                    'Please confirm if you would like to proceed\n'
+                    "Please confirm if you would like to proceed\n"
                     'You can also enable this beta feature with "sam build --beta-features".'
                 )
 

samcli/lib/build/workflow_config.py

@@ -6,7 +6,6 @@
 import os
 from typing import Dict, List, Optional, Union, cast
 
-from samcli.commands._utils.experimental import ExperimentalFlag, is_experimental_enabled
 from samcli.lib.build.workflows import (
     CONFIG,
     DOTNET_CLIPACKAGE_CONFIG,
@@ -161,13 +160,13 @@ def get_workflow_config(
     }
 
     selectors_by_runtime = {
-        "python3.8": BasicWorkflowSelector([PYTHON_PIP_CONFIG]),
-        "python3.9": BasicWorkflowSelector([PYTHON_PIP_CONFIG]),
-        "python3.10": BasicWorkflowSelector([PYTHON_PIP_CONFIG]),
-        "python3.11": BasicWorkflowSelector([PYTHON_PIP_CONFIG]),
-        "python3.12": BasicWorkflowSelector([PYTHON_PIP_CONFIG]),
-        "python3.13": BasicWorkflowSelector([PYTHON_PIP_CONFIG]),
-        "python3.14": BasicWorkflowSelector([PYTHON_PIP_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),
+        "python3.12": BasicWorkflowSelector(PYTHON_PIP_CONFIG),
+        "python3.13": BasicWorkflowSelector(PYTHON_PIP_CONFIG),
+        "python3.14": BasicWorkflowSelector(PYTHON_PIP_CONFIG),
         "nodejs16.x": BasicWorkflowSelector(NODEJS_NPM_CONFIG),
         "nodejs18.x": BasicWorkflowSelector(NODEJS_NPM_CONFIG),
         "nodejs20.x": BasicWorkflowSelector(NODEJS_NPM_CONFIG),
@@ -338,17 +337,3 @@ def get_config(self, code_dir: str, project_dir: str) -> CONFIG:
     @staticmethod
     def _has_manifest(config: CONFIG, directory: str) -> bool:
         return os.path.exists(os.path.join(directory, config.manifest_name))
-
-
-class ConditionalWorkflowSelector(BasicWorkflowSelector):
-    """
-    Selects between two workflow configs based on a condition
-    """
-
-    def __init__(self, default: CONFIG, alternative: CONFIG, use_alternative: bool = False):
-        self.default = default
-        self.alternative = alternative
-        self.use_alternative = use_alternative
-
-    def get_config(self, code_dir: str, project_dir: str) -> CONFIG:
-        return self.alternative if self.use_alternative else self.default

tests/integration/buildcmd/test_build_cmd_python.py

@@ -1,5 +1,4 @@
 import logging
-import os
 import pathlib
 from typing import Set
 from unittest import skipIf
@@ -622,22 +621,3 @@ def test_unsupported_runtime(self):
         self.assertEqual(1, process_execute.process.returncode)
 
         self.assertIn("Build Failed", str(process_execute.stdout))
-
-
-class TestBuildCommand_PythonUv(BuildIntegBase):
-    def test_build_python_with_uv_experimental_flag(self):
-        # Set experimental flag
-        os.environ["SAM_CLI_BETA_UV_PACKAGE_MANAGER"] = "true"
-
-        try:
-            overrides = {"Runtime": "python3.11", "CodeUri": "Python"}
-            cmdlist = self.get_command_list(parameter_overrides=overrides)
-
-            command_result = run_command(cmdlist, cwd=self.working_dir)
-
-            # Verify build succeeded
-            self.assertEqual(command_result.process.returncode, 0)
-
-        finally:
-            # Clean up environment
-            os.environ.pop("SAM_CLI_BETA_UV_PACKAGE_MANAGER", None)

tests/unit/lib/build_module/test_workflow_config.py

@@ -6,9 +6,7 @@
     get_workflow_config,
     UnsupportedRuntimeException,
     UnsupportedBuilderException,
-    ConditionalWorkflowSelector,
 )
-from samcli.lib.build.workflows import PYTHON_PIP_CONFIG, PYTHON_UV_CONFIG
 from samcli.lib.telemetry.event import Event, EventTracker
 
 
@@ -180,30 +178,3 @@ def test_must_raise_for_unsupported_runtimes(self):
             get_workflow_config(runtime, self.code_dir, self.project_dir)
 
         self.assertEqual(str(ctx.exception), "'foobar' runtime is not supported")
-
-
-class TestPythonUvWorkflowConfig(TestCase):
-    def setUp(self):
-        self.code_dir = ""
-        self.project_dir = ""
-        EventTracker.clear_trackers()
-
-    @patch("samcli.lib.build.workflow_config.is_experimental_enabled")
-    def test_python_uses_pip_when_uv_experimental_disabled(self, mock_experimental):
-        mock_experimental.return_value = False
-
-        result = get_workflow_config("python3.11", self.code_dir, self.project_dir)
-
-        self.assertEqual(result.language, "python")
-        self.assertEqual(result.dependency_manager, "pip")
-        self.assertEqual(result.manifest_name, "requirements.txt")
-
-    @patch("samcli.lib.build.workflow_config.is_experimental_enabled")
-    def test_python_uses_uv_when_experimental_enabled(self, mock_experimental):
-        mock_experimental.return_value = True
-
-        result = get_workflow_config("python3.11", self.code_dir, self.project_dir)
-
-        self.assertEqual(result.language, "python")
-        self.assertEqual(result.dependency_manager, "uv")
-        self.assertEqual(result.manifest_name, "pyproject.toml")