fix: switches typing to typing_extensions for python3.10 compatibility
This commit is contained in:
@@ -1,9 +1,9 @@
|
|||||||
from diceplayer.shared.utils.dataclass_protocol import Dataclass
|
from diceplayer.shared.utils.dataclass_protocol import Dataclass
|
||||||
|
|
||||||
from pydantic import BaseModel, Field
|
from pydantic import BaseModel, Field
|
||||||
|
from typing_extensions import List, Literal
|
||||||
|
|
||||||
from dataclasses import dataclass, fields
|
from dataclasses import dataclass, fields
|
||||||
from typing import List, Literal
|
|
||||||
|
|
||||||
|
|
||||||
class DiceConfig(BaseModel):
|
class DiceConfig(BaseModel):
|
||||||
|
|||||||
@@ -1,9 +1,9 @@
|
|||||||
from diceplayer.shared.utils.dataclass_protocol import Dataclass
|
from diceplayer.shared.utils.dataclass_protocol import Dataclass
|
||||||
|
|
||||||
from pydantic import BaseModel, Field
|
from pydantic import BaseModel, Field
|
||||||
|
from typing_extensions import Literal
|
||||||
|
|
||||||
from dataclasses import dataclass, fields
|
from dataclasses import dataclass, fields
|
||||||
from typing import Literal
|
|
||||||
|
|
||||||
|
|
||||||
class GaussianConfig(BaseModel):
|
class GaussianConfig(BaseModel):
|
||||||
|
|||||||
@@ -3,10 +3,10 @@ from diceplayer.config.gaussian_config import GaussianConfig
|
|||||||
from diceplayer.shared.utils.dataclass_protocol import Dataclass
|
from diceplayer.shared.utils.dataclass_protocol import Dataclass
|
||||||
|
|
||||||
from pydantic import BaseModel, Field, field_validator, model_validator
|
from pydantic import BaseModel, Field, field_validator, model_validator
|
||||||
|
from typing_extensions import Self
|
||||||
|
|
||||||
from dataclasses import dataclass, fields
|
from dataclasses import dataclass, fields
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import Self
|
|
||||||
|
|
||||||
MIN_STEP = 20000
|
MIN_STEP = 20000
|
||||||
|
|
||||||
|
|||||||
@@ -13,12 +13,12 @@ from diceplayer.shared.utils.ptable import atomsymb
|
|||||||
|
|
||||||
import yaml
|
import yaml
|
||||||
from pydantic import BaseModel
|
from pydantic import BaseModel
|
||||||
|
from typing_extensions import Tuple, Type
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import pickle
|
import pickle
|
||||||
import sys
|
import sys
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import Tuple, Type
|
|
||||||
|
|
||||||
ENV = ["OMP_STACKSIZE"]
|
ENV = ["OMP_STACKSIZE"]
|
||||||
|
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
from __future__ import annotations
|
from __future__ import annotations
|
||||||
|
|
||||||
from typing import TYPE_CHECKING
|
from typing_extensions import TYPE_CHECKING
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from nptyping import Float, NDArray, Shape
|
from nptyping import Float, NDArray, Shape
|
||||||
@@ -12,10 +12,10 @@ from diceplayer.shared.utils.ptable import ghost_number
|
|||||||
|
|
||||||
import numpy as np
|
import numpy as np
|
||||||
from numpy.linalg import linalg
|
from numpy.linalg import linalg
|
||||||
|
from typing_extensions import Any, List, Tuple, Union
|
||||||
|
|
||||||
import math
|
import math
|
||||||
from copy import deepcopy
|
from copy import deepcopy
|
||||||
from typing import Any, List, Tuple, Union
|
|
||||||
|
|
||||||
|
|
||||||
class Molecule:
|
class Molecule:
|
||||||
|
|||||||
@@ -5,10 +5,10 @@ from diceplayer.shared.utils.ptable import atomsymb
|
|||||||
|
|
||||||
import numpy as np
|
import numpy as np
|
||||||
from numpy import linalg
|
from numpy import linalg
|
||||||
|
from typing_extensions import List, TextIO, Tuple
|
||||||
|
|
||||||
import math
|
import math
|
||||||
from copy import deepcopy
|
from copy import deepcopy
|
||||||
from typing import List, TextIO, Tuple
|
|
||||||
|
|
||||||
|
|
||||||
class System:
|
class System:
|
||||||
|
|||||||
@@ -6,6 +6,7 @@ from diceplayer.shared.environment.system import System
|
|||||||
from diceplayer.shared.interface import Interface
|
from diceplayer.shared.interface import Interface
|
||||||
|
|
||||||
from setproctitle import setproctitle
|
from setproctitle import setproctitle
|
||||||
|
from typing_extensions import Final, TextIO
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import random
|
import random
|
||||||
@@ -15,7 +16,6 @@ import sys
|
|||||||
import time
|
import time
|
||||||
from multiprocessing import Process, connection
|
from multiprocessing import Process, connection
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import Final, TextIO
|
|
||||||
|
|
||||||
DICE_END_FLAG: Final[str] = "End of simulation"
|
DICE_END_FLAG: Final[str] = "End of simulation"
|
||||||
DICE_FLAG_LINE: Final[int] = -2
|
DICE_FLAG_LINE: Final[int] = -2
|
||||||
|
|||||||
@@ -11,13 +11,13 @@ from diceplayer.shared.utils.ptable import atomsymb
|
|||||||
|
|
||||||
import numpy as np
|
import numpy as np
|
||||||
from nptyping import NDArray
|
from nptyping import NDArray
|
||||||
|
from typing_extensions import Any, Dict, List, Tuple
|
||||||
|
|
||||||
import os
|
import os
|
||||||
import shutil
|
import shutil
|
||||||
import subprocess
|
import subprocess
|
||||||
import textwrap
|
import textwrap
|
||||||
from pathlib import Path
|
from pathlib import Path
|
||||||
from typing import Any, Dict, List, Tuple
|
|
||||||
|
|
||||||
|
|
||||||
class GaussianInterface(Interface):
|
class GaussianInterface(Interface):
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
from typing import Protocol, runtime_checkable
|
from typing_extensions import Protocol, runtime_checkable
|
||||||
|
|
||||||
|
|
||||||
@runtime_checkable
|
@runtime_checkable
|
||||||
|
|||||||
@@ -1,9 +1,10 @@
|
|||||||
|
from typing_extensions import Final
|
||||||
|
|
||||||
import gzip
|
import gzip
|
||||||
import os
|
import os
|
||||||
import shutil
|
import shutil
|
||||||
import sys
|
import sys
|
||||||
import time
|
import time
|
||||||
from typing import Final
|
|
||||||
|
|
||||||
####################################### constants ######################################
|
####################################### constants ######################################
|
||||||
|
|
||||||
|
|||||||
2
poetry.lock
generated
2
poetry.lock
generated
@@ -801,4 +801,4 @@ test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess
|
|||||||
[metadata]
|
[metadata]
|
||||||
lock-version = "2.1"
|
lock-version = "2.1"
|
||||||
python-versions = ">=3.9"
|
python-versions = ">=3.9"
|
||||||
content-hash = "4a1819a86e32881c06191270ef503ebe87ef4ff519052fd8f0852510e31668e1"
|
content-hash = "5279a27d4c4f2d07ca08ba879729efb8e7259c64907bbac87e5f574818eb66e2"
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ setproctitle = "^1.3.2"
|
|||||||
pyyaml = "^6.0"
|
pyyaml = "^6.0"
|
||||||
nptyping = "^2.5.0"
|
nptyping = "^2.5.0"
|
||||||
pydantic = "^2.12.5"
|
pydantic = "^2.12.5"
|
||||||
|
typing-extensions = "^4.15.0"
|
||||||
|
|
||||||
|
|
||||||
[tool.poetry.group.dev.dependencies]
|
[tool.poetry.group.dev.dependencies]
|
||||||
|
|||||||
@@ -1,5 +1,6 @@
|
|||||||
|
from typing_extensions import List
|
||||||
|
|
||||||
import itertools
|
import itertools
|
||||||
from typing import List
|
|
||||||
|
|
||||||
|
|
||||||
class MockProc:
|
class MockProc:
|
||||||
|
|||||||
Reference in New Issue
Block a user