Skip to content

Commit d576000

Browse files
author
Martin Stadler
committed
Fix Python typing includes for python < 3.12 (closes #55)
1 parent c5fa3c1 commit d576000

File tree

9 files changed

+71
-9
lines changed

9 files changed

+71
-9
lines changed

src/icon/client/client.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
import asyncio
22
import logging
33
from io import StringIO
4-
from typing import TYPE_CHECKING, Any, TypedDict
4+
from typing import TYPE_CHECKING, Any
5+
import sys
6+
if sys.version_info < (3, 12):
7+
from typing_extensions import TypedDict
8+
else:
9+
from typing import TypedDict
510

611
import pandas as pd
712
import pydase

src/icon/server/api/models/device_dict.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,8 @@
1-
from typing import TypedDict
1+
import sys
2+
if sys.version_info < (3, 12):
3+
from typing_extensions import TypedDict
4+
else:
5+
from typing import TypedDict
26

37

48
class DeviceDict(TypedDict):

src/icon/server/api/models/experiment_dict.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
from typing import Any, TypedDict
1+
from typing import Any
2+
import sys
3+
if sys.version_info < (3, 12):
4+
from typing_extensions import TypedDict
5+
else:
6+
from typing import TypedDict
27

38
from icon.server.api.models.parameter_metadata import ParameterMetadata
49

src/icon/server/api/models/parameter_metadata.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,9 @@
1-
from typing import Any, TypedDict
1+
from typing import Any
2+
import sys
3+
if sys.version_info < (3, 12):
4+
from typing_extensions import TypedDict
5+
else:
6+
from typing import TypedDict
27

38

49
class ParameterMetadata(TypedDict):

src/icon/server/api/models/scan_parameter.py

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

3-
from typing import Any, NotRequired, TypedDict
3+
from typing import Any
4+
5+
import sys
6+
if sys.version_info < (3, 11):
7+
from typing_extensions import NotRequired
8+
else:
9+
from typing import NotRequired
10+
11+
if sys.version_info < (3, 12):
12+
from typing_extensions import TypedDict
13+
else:
14+
from typing import TypedDict
415

516

617
class ScanParameter(TypedDict):

src/icon/server/data_access/repositories/experiment_data_repository.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,12 @@
22
import logging
33
import os
44
from datetime import datetime
5-
from typing import TYPE_CHECKING, Literal, TypedDict, cast
5+
from typing import TYPE_CHECKING, Literal, cast
6+
import sys
7+
if sys.version_info < (3, 12):
8+
from typing_extensions import TypedDict
9+
else:
10+
from typing import TypedDict
611

712
import h5py # type: ignore
813
import numpy as np

src/icon/server/data_access/repositories/pycrystal_library_repository.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
import asyncio
22
import json
33
from pathlib import Path
4-
from typing import Any, TypedDict
4+
from typing import Any
5+
import sys
6+
if sys.version_info < (3, 12):
7+
from typing_extensions import TypedDict
8+
else:
9+
from typing import TypedDict
510

611
from icon.config.config import get_config
712
from icon.server.api.models.experiment_dict import (

src/icon/server/utils/types.py

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,15 @@
1-
from typing import Literal, NotRequired, TypedDict
1+
from typing import Literal
2+
3+
import sys
4+
if sys.version_info < (3, 11):
5+
from typing_extensions import NotRequired
6+
else:
7+
from typing import NotRequired
8+
9+
if sys.version_info < (3, 12):
10+
from typing_extensions import TypedDict
11+
else:
12+
from typing import TypedDict
213

314
from icon.server.data_access.db_context.influxdb_v1 import DatabaseValueType
415

src/icon/server/web_server/socketio_emit_queue.py

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,18 @@
11
from __future__ import annotations
22

33
import multiprocessing
4-
from typing import Any, NotRequired, TypedDict
4+
from typing import Any
5+
6+
import sys
7+
if sys.version_info < (3, 11):
8+
from typing_extensions import NotRequired
9+
else:
10+
from typing import NotRequired
11+
12+
if sys.version_info < (3, 12):
13+
from typing_extensions import TypedDict
14+
else:
15+
from typing import TypedDict
516

617

718
class EmitEvent(TypedDict):

0 commit comments

Comments
 (0)