Skip to content
This repository was archived by the owner on Jan 23, 2026. It is now read-only.

Commit 428e212

Browse files
authored
Merge pull request #376 from bennyz/fix-matrix-test
fix matrix test
2 parents 892b71a + c3b9e1f commit 428e212

3 files changed

Lines changed: 12 additions & 5 deletions

File tree

  • .github/workflows
  • packages
    • jumpstarter-driver-shell/jumpstarter_driver_shell
    • jumpstarter-kubernetes/jumpstarter_kubernetes

.github/workflows/pytest.yaml

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,10 @@ jobs:
6262
done
6363
6464
- name: Run pytest
65-
run: make test
65+
run: |
66+
export UV_PYTHON=${{ matrix.python-version }}
67+
make test
68+
6669
6770
# https://github.com/orgs/community/discussions/26822
6871
pytest:

packages/jumpstarter-driver-shell/jumpstarter_driver_shell/driver.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,9 +38,11 @@ def call_method(self, method: str, env, *args):
3838
if result.returncode != 0:
3939
self.logger.info(f"{method} return code: {result.returncode}")
4040
if result.stderr != "":
41-
self.logger.debug(f"{method} stderr:\n{result.stderr.rstrip('\n')}")
41+
stderr = result.stderr.rstrip("\n")
42+
self.logger.debug(f"{method} stderr:\n{stderr}")
4243
if result.stdout != "":
43-
self.logger.debug(f"{method} stdout:\n{result.stdout.rstrip('\n')}")
44+
stdout = result.stdout.rstrip("\n")
45+
self.logger.debug(f"{method} stdout:\n{stdout}")
4446
return result.stdout, result.stderr, result.returncode
4547
except subprocess.TimeoutExpired as e:
4648
self.logger.error(f"Timeout expired while running {method}: {e}")

packages/jumpstarter-kubernetes/jumpstarter_kubernetes/list.py

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
1-
from typing import Literal
1+
from typing import Generic, Literal, TypeVar
22

33
from pydantic import Field
44

55
from .json import JsonBaseModel
66

7+
T = TypeVar("T")
78

8-
class V1Alpha1List[T](JsonBaseModel):
9+
10+
class V1Alpha1List(JsonBaseModel, Generic[T]):
911
"""A generic list result type."""
1012

1113
api_version: Literal["jumpstarter.dev/v1alpha1"] = Field(alias="apiVersion", default="jumpstarter.dev/v1alpha1")

0 commit comments

Comments
 (0)