Skip to content

Commit 832929d

Browse files
authored
Merge pull request #656 from OZI-Project/main
Release
2 parents 498ce47 + 5d62707 commit 832929d

4 files changed

Lines changed: 26 additions & 5 deletions

File tree

ozi_core/config.py

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,26 @@
11
from __future__ import annotations
22

3+
import sys
34
from dataclasses import asdict
45
from dataclasses import dataclass
56
from dataclasses import field
67
from dataclasses import fields
78
from importlib.metadata import PackageNotFoundError
89
from importlib.metadata import version
910
from pathlib import Path
10-
from typing import Self
11+
from typing import TYPE_CHECKING
1112

1213
import yaml
1314
from platformdirs import user_config_dir
1415

1516
from ozi_core import __version__
1617

18+
if TYPE_CHECKING:
19+
if sys.version_info > (3, 11):
20+
from typing import Self
21+
else:
22+
from typing_extensions import Self
23+
1724
try:
1825
core_version = version('ozi-core')
1926
except PackageNotFoundError:

ozi_core/config.pyi

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,13 @@
11
from __future__ import annotations
22

3+
import sys
34
from dataclasses import dataclass
45
from pathlib import Path
5-
from typing import Self
6+
7+
if sys.version_info > (3, 11):
8+
from typing import Self
9+
else:
10+
from typing_extensions import Self
611

712
from ozi_core import __version__ as __version__
813

pyproject.toml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ dependencies = [
3535
'dnspython~=2.7.0',
3636
'idna~=3.10',
3737
'meson[ninja]~=1.1',
38-
'ozi-templates==2.24.3',
39-
'ozi-spec==0.27.1',
38+
'ozi-templates==2.24.4',
39+
'ozi-spec==0.27.2',
4040
'packaging>=24.1,<26.0',
4141
'platformdirs~=4.3',
4242
'prompt-toolkit~=3.0.48',
@@ -45,6 +45,7 @@ dependencies = [
4545
'niquests~=3.14.0',
4646
'spdx-license-list==3.26.0',
4747
'trove-classifiers==2025.4.11.15',
48+
'typing-extensions;python_version<="3.11"',
4849
'types-PyYAML~=6.0',
4950
'pathvalidate~=3.2.1',
5051
'webui2==2.5.5',

tests/test_actions.py

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,23 @@
22
from __future__ import annotations
33

44
import argparse
5+
import sys
56
import typing
7+
import warnings
68
from datetime import timedelta
79

810
import pytest
911
from hypothesis import given
1012
from hypothesis import settings
1113
from hypothesis import strategies as st
1214

13-
import ozi_core.actions
15+
if sys.version_info < (3, 11):
16+
warnings.filterwarnings('ignore', category=FutureWarning)
17+
import ozi_core.actions
18+
19+
warnings.filterwarnings('default')
20+
else:
21+
import ozi_core.actions
1422

1523

1624
@settings(deadline=timedelta(milliseconds=500))

0 commit comments

Comments
 (0)