typing_extensions: uses typing if available so import directly, not via instamatic._typing

Author: Baharis

src/instamatic/_typing.py

@@ -1,24 +1,6 @@
 from __future__ import annotations
 
-import sys
-
-# ~~~~~~~~~~~~~~~~~~~~~~~~ TYPING EXTENSIONS ALIASES ~~~~~~~~~~~~~~~~~~~~~~~~~ #
-
-
-if sys.version_info >= (3, 9):
-    from typing import Annotated
-else:
-    from typing_extensions import Annotated
-
-
-if sys.version_info >= (3, 11):
-    from typing import Self
-else:
-    from typing_extensions import Self
-
-
-# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ CUSTOM TYPES ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ #
-
+from typing_extensions import Annotated
 
 int_nm = Annotated[int, 'Length expressed in nanometers']
 float_deg = Annotated[float, 'Angle expressed in degrees']

src/instamatic/calibrate/calibrate_beamshift.py

@@ -8,9 +8,9 @@
 import matplotlib.pyplot as plt
 import numpy as np
 from skimage.registration import phase_cross_correlation
+from typing_extensions import Self
 
 from instamatic import config
-from instamatic._typing import Self
 from instamatic.image_utils import autoscale, imgscale
 from instamatic.processing.find_holes import find_holes
 from instamatic.tools import find_beam_center, printer

src/instamatic/calibrate/calibrate_brightness.py

@@ -6,8 +6,8 @@
 
 import matplotlib.pyplot as plt
 import numpy as np
+from typing_extensions import Self
 
-from instamatic._typing import Self
 from instamatic.image_utils import autoscale
 from instamatic.processing.find_holes import find_holes
 from instamatic.tools import find_beam_center

src/instamatic/calibrate/calibrate_directbeam.py

@@ -8,9 +8,9 @@
 import matplotlib.pyplot as plt
 import numpy as np
 from skimage.registration import phase_cross_correlation
+from typing_extensions import Self
 
 from instamatic import config
-from instamatic._typing import Self
 from instamatic.image_utils import autoscale, imgscale
 from instamatic.tools import printer
 

src/instamatic/calibrate/calibrate_stage_lowmag.py

@@ -7,8 +7,8 @@
 import matplotlib.pyplot as plt
 import numpy as np
 from skimage.registration import phase_cross_correlation
+from typing_extensions import Self
 
-from instamatic._typing import Self
 from instamatic.formats import read_image
 from instamatic.image_utils import autoscale, imgscale
 

src/instamatic/camera/camera_base.py

@@ -4,9 +4,9 @@
 from typing import List, Optional, Tuple
 
 import numpy as np
+from typing_extensions import Self
 
 from instamatic import config
-from instamatic._typing import Self
 
 
 class CameraBase(ABC):

src/instamatic/camera/merlin_io.py

@@ -4,8 +4,7 @@
 from typing import List
 
 import numpy as np
-
-from instamatic._typing import Self
+from typing_extensions import Self
 
 
 class MIBProperties:

src/instamatic/config/__init__.py

@@ -9,8 +9,7 @@
 from pathlib import Path
 
 import yaml
-
-from instamatic._typing import Self
+from typing_extensions import Self
 
 from .config_updater import (
     check_defaults_yaml,

src/instamatic/experiments/experiment_base.py

@@ -2,7 +2,7 @@
 
 from abc import ABC, abstractmethod
 
-from instamatic._typing import Self
+from typing_extensions import Self
 
 
 class ExperimentBase(ABC):

src/instamatic/gui/click_dispatcher.py

@@ -4,8 +4,9 @@
 import queue
 from typing import Callable, Optional, Union
 
+from typing_extensions import Self
+
 from instamatic._collections import NoOverwriteDict
-from instamatic._typing import Self
 
 
 class MouseButton(enum.IntEnum):