Skip to content

Commit cee90a2

Browse files
authored
refactor: move types.py to statustypes.py to avoid confusion with stdlib (#28)
There's a (somewhat rarely-used) stdlib module named "types", so it seems best to avoid confusion with this. Also updates the dev dependencies (it was the upgrade of ruff that complained about this).
1 parent f1dd8f0 commit cee90a2

File tree

6 files changed

+32
-32
lines changed

6 files changed

+32
-32
lines changed

jubilant/__init__.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
"""Jubilant is a Pythonic wrapper around the Juju CLI for integration testing."""
22

3-
from . import types
3+
from . import statustypes
44
from ._helpers import (
55
all_active,
66
all_blocked,
@@ -14,7 +14,7 @@
1414
any_waiting,
1515
)
1616
from ._juju import CLIError, Juju, WaitError
17-
from .types import Status
17+
from .statustypes import Status
1818

1919
__all__ = [
2020
'CLIError',
@@ -31,7 +31,7 @@
3131
'any_error',
3232
'any_maintenance',
3333
'any_waiting',
34-
'types',
34+
'statustypes',
3535
]
3636

3737
__version__ = '0.0.0a1'

jubilant/_helpers.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
from collections.abc import Iterable
22

3-
from .types import Status
3+
from .statustypes import Status
44

55

66
def all_active(status: Status, apps: Iterable[str] | None = None) -> bool:

jubilant/_juju.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import time
66
from collections.abc import Callable, Iterable
77

8-
from .types import Status
8+
from .statustypes import Status
99

1010
logger = logging.getLogger('jubilant')
1111

File renamed without changes.

pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@ dynamic = ["version"]
77

88
[dependency-groups]
99
dev = [
10-
"pyright==1.1.390",
10+
"pyright==1.1.394",
1111
"pytest==8.3.4",
12-
"ruff==0.8.2",
12+
"ruff==0.9.6",
1313
]
1414
docs = [
1515
"sphinx==8.1.3",
@@ -105,7 +105,7 @@ convention = "google"
105105
builtins-ignorelist = ["id", "min", "map", "range", "type", "input", "format"]
106106

107107
[tool.ruff.lint.per-file-ignores]
108-
"jubilant/types.py" = [
108+
"jubilant/statustypes.py" = [
109109
# Missing docstring in public class
110110
"D101",
111111
]

uv.lock

Lines changed: 24 additions & 24 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)