From 0edb17f21e9736c57882e88adb4f20ff77a8ddcd Mon Sep 17 00:00:00 2001 From: Benny Zlotnik Date: Tue, 25 Mar 2025 16:07:07 +0200 Subject: [PATCH 1/3] fix matrix test Signed-off-by: Benny Zlotnik --- .github/workflows/pytest.yaml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/pytest.yaml b/.github/workflows/pytest.yaml index 0ffd0bea3..df0191a5b 100644 --- a/.github/workflows/pytest.yaml +++ b/.github/workflows/pytest.yaml @@ -62,7 +62,10 @@ jobs: done - name: Run pytest - run: make test + run: | + export UV_PYTHON=${{ matrix.python-version }} + make test + # https://github.com/orgs/community/discussions/26822 pytest: From 8eea815a9d1e937b1d58321730051cf6925fa208 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 25 Mar 2025 10:28:08 -0400 Subject: [PATCH 2/3] Use old style generics --- .../jumpstarter-kubernetes/jumpstarter_kubernetes/list.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/jumpstarter-kubernetes/jumpstarter_kubernetes/list.py b/packages/jumpstarter-kubernetes/jumpstarter_kubernetes/list.py index ffeb532c9..3c8dc41d1 100644 --- a/packages/jumpstarter-kubernetes/jumpstarter_kubernetes/list.py +++ b/packages/jumpstarter-kubernetes/jumpstarter_kubernetes/list.py @@ -1,11 +1,13 @@ -from typing import Literal +from typing import Generic, Literal, TypeVar from pydantic import Field from .json import JsonBaseModel +T = TypeVar("T") -class V1Alpha1List[T](JsonBaseModel): + +class V1Alpha1List(JsonBaseModel, Generic[T]): """A generic list result type.""" api_version: Literal["jumpstarter.dev/v1alpha1"] = Field(alias="apiVersion", default="jumpstarter.dev/v1alpha1") From c3b9e1f4cf979ad720d1f9bff9a31df454e956af Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Tue, 25 Mar 2025 10:39:03 -0400 Subject: [PATCH 3/3] Avoid having backslash in f-string expression part --- .../jumpstarter_driver_shell/driver.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/jumpstarter-driver-shell/jumpstarter_driver_shell/driver.py b/packages/jumpstarter-driver-shell/jumpstarter_driver_shell/driver.py index 621763ccb..979747a4a 100644 --- a/packages/jumpstarter-driver-shell/jumpstarter_driver_shell/driver.py +++ b/packages/jumpstarter-driver-shell/jumpstarter_driver_shell/driver.py @@ -38,9 +38,11 @@ def call_method(self, method: str, env, *args): if result.returncode != 0: self.logger.info(f"{method} return code: {result.returncode}") if result.stderr != "": - self.logger.debug(f"{method} stderr:\n{result.stderr.rstrip('\n')}") + stderr = result.stderr.rstrip("\n") + self.logger.debug(f"{method} stderr:\n{stderr}") if result.stdout != "": - self.logger.debug(f"{method} stdout:\n{result.stdout.rstrip('\n')}") + stdout = result.stdout.rstrip("\n") + self.logger.debug(f"{method} stdout:\n{stdout}") return result.stdout, result.stderr, result.returncode except subprocess.TimeoutExpired as e: self.logger.error(f"Timeout expired while running {method}: {e}")