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: 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}") 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")