diff --git a/diceplayer/config/dice_config.py b/diceplayer/config/dice_config.py index 907d5bf..a50ed5d 100644 --- a/diceplayer/config/dice_config.py +++ b/diceplayer/config/dice_config.py @@ -1,9 +1,9 @@ from diceplayer.shared.utils.dataclass_protocol import Dataclass from pydantic import BaseModel, Field +from typing_extensions import List, Literal from dataclasses import dataclass, fields -from typing import List, Literal class DiceConfig(BaseModel): diff --git a/diceplayer/config/gaussian_config.py b/diceplayer/config/gaussian_config.py index bc741b2..72c6c9d 100644 --- a/diceplayer/config/gaussian_config.py +++ b/diceplayer/config/gaussian_config.py @@ -1,9 +1,9 @@ from diceplayer.shared.utils.dataclass_protocol import Dataclass from pydantic import BaseModel, Field +from typing_extensions import Literal from dataclasses import dataclass, fields -from typing import Literal class GaussianConfig(BaseModel): diff --git a/diceplayer/config/player_config.py b/diceplayer/config/player_config.py index 1ec4993..da14432 100644 --- a/diceplayer/config/player_config.py +++ b/diceplayer/config/player_config.py @@ -3,10 +3,10 @@ from diceplayer.config.gaussian_config import GaussianConfig from diceplayer.shared.utils.dataclass_protocol import Dataclass from pydantic import BaseModel, Field, field_validator, model_validator +from typing_extensions import Self from dataclasses import dataclass, fields from pathlib import Path -from typing import Self MIN_STEP = 20000 diff --git a/diceplayer/player.py b/diceplayer/player.py index 5aa2f5b..e4cb5e0 100644 --- a/diceplayer/player.py +++ b/diceplayer/player.py @@ -13,12 +13,12 @@ from diceplayer.shared.utils.ptable import atomsymb import yaml from pydantic import BaseModel +from typing_extensions import Tuple, Type import os import pickle import sys from pathlib import Path -from typing import Tuple, Type ENV = ["OMP_STACKSIZE"] diff --git a/diceplayer/shared/environment/molecule.py b/diceplayer/shared/environment/molecule.py index e4003b4..28571c7 100644 --- a/diceplayer/shared/environment/molecule.py +++ b/diceplayer/shared/environment/molecule.py @@ -1,6 +1,6 @@ from __future__ import annotations -from typing import TYPE_CHECKING +from typing_extensions import TYPE_CHECKING if TYPE_CHECKING: from nptyping import Float, NDArray, Shape @@ -12,10 +12,10 @@ from diceplayer.shared.utils.ptable import ghost_number import numpy as np from numpy.linalg import linalg +from typing_extensions import Any, List, Tuple, Union import math from copy import deepcopy -from typing import Any, List, Tuple, Union class Molecule: diff --git a/diceplayer/shared/environment/system.py b/diceplayer/shared/environment/system.py index f8e5dd8..8610a00 100644 --- a/diceplayer/shared/environment/system.py +++ b/diceplayer/shared/environment/system.py @@ -5,10 +5,10 @@ from diceplayer.shared.utils.ptable import atomsymb import numpy as np from numpy import linalg +from typing_extensions import List, TextIO, Tuple import math from copy import deepcopy -from typing import List, TextIO, Tuple class System: diff --git a/diceplayer/shared/interface/dice_interface.py b/diceplayer/shared/interface/dice_interface.py index c13ef63..36c852f 100644 --- a/diceplayer/shared/interface/dice_interface.py +++ b/diceplayer/shared/interface/dice_interface.py @@ -6,6 +6,7 @@ from diceplayer.shared.environment.system import System from diceplayer.shared.interface import Interface from setproctitle import setproctitle +from typing_extensions import Final, TextIO import os import random @@ -15,7 +16,6 @@ import sys import time from multiprocessing import Process, connection from pathlib import Path -from typing import Final, TextIO DICE_END_FLAG: Final[str] = "End of simulation" DICE_FLAG_LINE: Final[int] = -2 diff --git a/diceplayer/shared/interface/gaussian_interface.py b/diceplayer/shared/interface/gaussian_interface.py index 73b372a..be203f7 100644 --- a/diceplayer/shared/interface/gaussian_interface.py +++ b/diceplayer/shared/interface/gaussian_interface.py @@ -11,13 +11,13 @@ from diceplayer.shared.utils.ptable import atomsymb import numpy as np from nptyping import NDArray +from typing_extensions import Any, Dict, List, Tuple import os import shutil import subprocess import textwrap from pathlib import Path -from typing import Any, Dict, List, Tuple class GaussianInterface(Interface): diff --git a/diceplayer/shared/utils/dataclass_protocol.py b/diceplayer/shared/utils/dataclass_protocol.py index 7d7c4da..967e7c1 100644 --- a/diceplayer/shared/utils/dataclass_protocol.py +++ b/diceplayer/shared/utils/dataclass_protocol.py @@ -1,4 +1,4 @@ -from typing import Protocol, runtime_checkable +from typing_extensions import Protocol, runtime_checkable @runtime_checkable diff --git a/diceplayer/shared/utils/misc.py b/diceplayer/shared/utils/misc.py index af2ac13..3884b52 100644 --- a/diceplayer/shared/utils/misc.py +++ b/diceplayer/shared/utils/misc.py @@ -1,9 +1,10 @@ +from typing_extensions import Final + import gzip import os import shutil import sys import time -from typing import Final ####################################### constants ###################################### diff --git a/poetry.lock b/poetry.lock index 44ca879..90734f3 100644 --- a/poetry.lock +++ b/poetry.lock @@ -801,4 +801,4 @@ test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess [metadata] lock-version = "2.1" python-versions = ">=3.9" -content-hash = "4a1819a86e32881c06191270ef503ebe87ef4ff519052fd8f0852510e31668e1" +content-hash = "5279a27d4c4f2d07ca08ba879729efb8e7259c64907bbac87e5f574818eb66e2" diff --git a/pyproject.toml b/pyproject.toml index c25892c..0c1c429 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -24,6 +24,7 @@ setproctitle = "^1.3.2" pyyaml = "^6.0" nptyping = "^2.5.0" pydantic = "^2.12.5" +typing-extensions = "^4.15.0" [tool.poetry.group.dev.dependencies] diff --git a/tests/mocks/mock_proc.py b/tests/mocks/mock_proc.py index 3c6310f..2dfa1d1 100644 --- a/tests/mocks/mock_proc.py +++ b/tests/mocks/mock_proc.py @@ -1,5 +1,6 @@ +from typing_extensions import List + import itertools -from typing import List class MockProc: