fix: use scaleway runtime when vendoring deps

Author: cyclimse

scw_serverless/cli.py

@@ -119,14 +119,22 @@ def deploy(
 
     client = deployment.get_scw_client(profile, secret_key, project_id, region)
 
+    if not runtime:
+        runtime = deployment.get_current_runtime()
+
     logging.info("Packaging dependencies...")
-    DependenciesManager(file.parent, Path("./")).generate_package_folder()
+    deps = DependenciesManager(
+        file.parent,
+        Path("./"),
+        runtime=runtime,
+    )
+    deps.generate_package_folder()
 
     try:
         deployment.DeploymentManager(
             app_instance=app_instance,
             sdk_client=client,
-            runtime_override=runtime,
+            runtime=runtime,
             single_source=single_source,
         ).deploy()
     except ScalewayException as e:

scw_serverless/dependencies_manager.py

@@ -1,6 +1,7 @@
 import logging
 import os
 import pathlib
+import re
 import subprocess
 import sys
 from importlib.metadata import version
@@ -25,9 +26,15 @@ class DependenciesManager:
         <https://developers.scaleway.com/en/products/functions/api/#python-additional-dependencies>
     """
 
-    def __init__(self, in_path: pathlib.Path, out_path: pathlib.Path) -> None:
+    def __init__(
+        self, in_path: pathlib.Path, out_path: pathlib.Path, runtime: str
+    ) -> None:
         self.in_path = in_path
         self.out_path = out_path
+        self.runtime_version = "310"
+        version_pattern = r"python(\d+)"
+        if match := re.search(version_pattern, runtime):
+            self.runtime_version = str(match.group(1))
 
     @property
     def pkg_path(self) -> pathlib.Path:
@@ -65,7 +72,13 @@ def _install_requirements(self, requirements_path: pathlib.Path):
         if not self.out_path.is_dir():
             raise ValueError(f"Out_path: {self.out_path.absolute} is not a directory")
         logging.debug("Install dependencies from requirements to %s", self.pkg_path)
-        self._run_pip_install("-r", str(requirements_path.resolve()))
+        self._run_pip_install(
+            "-r",
+            str(requirements_path.resolve()),
+            "--python-version",
+            self.runtime_version,
+            "--only-binary=:all:",
+        )
 
     def _check_for_scw_serverless(self):
         """Checks for scw_serverless after vendoring the dependencies."""
@@ -75,7 +88,12 @@ def _check_for_scw_serverless(self):
         ):
             # Installs the current version with pip
             logging.debug("Installing %s from pip to %s", __package__, self.pkg_path)
-            self._run_pip_install(f"{__package__}~={version(__package__)}")
+            self._run_pip_install(
+                f"{__package__}~={version(__package__)}",
+                "--python-version",
+                self.runtime_version,
+                "--only-binary=:all:",
+            )
 
     def _run_pip_install(self, *args: str):
         python_path = sys.executable

scw_serverless/deployment/__init__.py

@@ -1,3 +1,4 @@
 from .client import get_scw_client as get_scw_client
 from .deployment_manager import DeploymentManager as DeploymentManager
 from .exceptions import log_scaleway_exception as log_scaleway_exception
+from .runtime import get_current_runtime as get_current_runtime

scw_serverless/deployment/deployment_manager.py

@@ -1,7 +1,6 @@
 import logging
 import multiprocessing
 import os
-from typing import Optional
 
 import click
 import requests
@@ -12,7 +11,6 @@
 from scw_serverless.config.function import Function
 from scw_serverless.config.triggers import CronTrigger
 from scw_serverless.deployment.api_wrapper import FunctionAPIWrapper
-from scw_serverless.deployment.runtime import get_current_runtime
 from scw_serverless.utils.files import create_zip_file
 
 TEMP_DIR = "./.scw"
@@ -28,17 +26,14 @@ def __init__(
         app_instance: Serverless,
         sdk_client: Client,
         single_source: bool,
-        runtime_override: Optional[str] = None,
+        runtime: str,
     ):
         self.api = FunctionAPIWrapper(api=sdk.FunctionV1Beta1API(sdk_client))
         self.app_instance = app_instance
         self.sdk_client = sdk_client
         # Behavior configuration
         self.single_source = single_source
-        if runtime_override:
-            self.runtime = sdk.FunctionRuntime(runtime_override)
-        else:
-            self.runtime = get_current_runtime()
+        self.runtime = sdk.FunctionRuntime(runtime)
 
     def _get_or_create_function(self, function: Function, namespace_id: str) -> str:
         logging.info("Looking for an existing function %s...", function.name)

tests/test_dependencies_manager.py

@@ -21,7 +21,7 @@ def test_dependencies_manager_generate_package_folder(pkg_folder: Path):
     with open(req_path, mode="w", encoding="utf-8") as fp:
         fp.write("PyYAML==6.0\n" + "scw_serverless==0.0.1b")
 
-    manager = DependenciesManager(pkg_folder, pkg_folder)
+    manager = DependenciesManager(pkg_folder, pkg_folder, runtime="python311")
     manager.generate_package_folder()
 
     assert "package" in os.listdir(pkg_folder)
@@ -36,7 +36,7 @@ def test_dependencies_manager_install_scw_from_local(pkg_folder: Path):
     with open(req_path, mode="w", encoding="utf-8") as fp:
         fp.write("PyYAML==6.0")
 
-    manager = DependenciesManager(pkg_folder, pkg_folder)
+    manager = DependenciesManager(pkg_folder, pkg_folder, runtime="python311")
     manager.generate_package_folder()
 
     assert "package" in os.listdir(pkg_folder)

tests/test_deployment/test_deployment_manager.py

@@ -40,7 +40,7 @@ def get_test_backend() -> DeploymentManager:
         secret_key="498cce73-2a07-4e8c-b8ef-8f988e3c6929",  # nosec # fake data
         default_region=constants.DEFAULT_REGION,
     )
-    backend = DeploymentManager(app, client, False, runtime_override=RUNTIME)
+    backend = DeploymentManager(app, client, False, runtime=RUNTIME)
     # This would otherwise create some side effects
     create_zip = MagicMock()
     create_zip.return_value = 300