Only use typing_extensions for Self

conftest.py

@@ -1,8 +1,7 @@
 """Configuration for the pytest tests."""
 
-import pytest
 import matplotlib
-
+import pytest
 
 matplotlib.use('Agg')  # Use non-interactive backend to prevent loss of focus during test.
 

pyproject.toml

@@ -3,7 +3,7 @@ name = "qusi"
 dynamic = ["version"]
 description = ""
 authors = [
-    { name = "golmschenk", email = "[email protected]" },
+    { name = "Greg Olmschenk", email = "[email protected]" },
 ]
 readme = "README.md"
 requires-python = ">=3.9"

src/qusi/finite_standard_light_curve_dataset.py

@@ -1,9 +1,7 @@
 from dataclasses import dataclass
 from functools import partial
-try:
-    from typing import List, Callable, Any, Self
-except ImportError:
-    from typing_extensions import List, Callable, Any, Self
+from typing import List, Callable, Any
+from typing_extensions import Self
 
 import numpy as np
 from torch.utils.data import Dataset

src/qusi/finite_standard_light_curve_observation_dataset.py

@@ -1,9 +1,7 @@
 from dataclasses import dataclass
 from functools import partial
-try:
-    from typing import List, Callable, Any, Self
-except ImportError:
-    from typing_extensions import List, Callable, Any, Self
+from typing import List, Callable, Any
+from typing_extensions import Self
 
 import numpy as np
 from torch.utils.data import Dataset

src/qusi/finite_test_session.py

@@ -1,7 +1,4 @@
-try:
-    from typing import List
-except ImportError:
-    from typing_extensions import List
+from typing import List
 
 import torch
 from torch.nn import Module

src/qusi/hadryss_model.py

@@ -1,10 +1,8 @@
 from __future__ import annotations
 
 import math
-try:
-    from typing import Self, List
-except ImportError:
-    from typing_extensions import Self, List
+from typing import List
+from typing_extensions import Self
 
 import torch
 from torch import Tensor

src/qusi/infer_session.py

@@ -1,7 +1,4 @@
-try:
-    from typing import List
-except ImportError:
-    from typing_extensions import List
+from typing import List
 
 import numpy as np
 import torch

src/qusi/light_curve.py

@@ -1,9 +1,6 @@
 from copy import deepcopy
 from dataclasses import dataclass
-try:
-    from typing import Self
-except ImportError:
-    from typing_extensions import Self
+from typing_extensions import Self
 
 import numpy as np
 import numpy.typing as npt

src/qusi/light_curve_collection.py

@@ -4,10 +4,8 @@
 from random import Random
 from abc import ABC, abstractmethod
 from pathlib import Path
-try:
-    from typing import Iterable, Callable, Self, Iterator, List, Tuple
-except ImportError:
-    from typing_extensions import Iterable, Callable, Self, Iterator, List, Tuple
+from typing import Iterable, Callable, Iterator, List, Tuple
+from typing_extensions import Self
 
 import numpy as np
 import numpy.typing as npt

src/qusi/light_curve_dataset.py

@@ -8,10 +8,8 @@
 from enum import Enum
 from functools import partial
 from pathlib import Path
-try:
-    from typing import List, Iterable, Self, Tuple, TypeVar, Iterator, Callable, Any
-except ImportError:
-    from typing_extensions import List, Iterable, Self, Tuple, TypeVar, Iterator, Callable, Any
+from typing import List, Iterable, Tuple, TypeVar, Iterator, Callable, Any
+from typing_extensions import Self
 
 
 import numpy as np

src/qusi/light_curve_observation.py

@@ -1,9 +1,6 @@
 from copy import deepcopy
 from dataclasses import dataclass
-try:
-    from typing import Self
-except ImportError:
-    from typing_extensions import Self
+from typing_extensions import Self
 
 from qusi.light_curve import LightCurve, remove_nan_flux_data_points_from_light_curve, randomly_roll_light_curve
 

src/qusi/light_curve_transforms.py

@@ -1,7 +1,4 @@
-try:
-    from typing import Tuple
-except ImportError:
-    from typing_extensions import Tuple
+from typing import Tuple
 
 import torch
 import numpy.typing as npt

src/qusi/toy_light_curve_collection.py

@@ -1,9 +1,6 @@
 from pathlib import Path
 
-try:
-    from typing import List
-except ImportError:
-    from typing_extensions import List
+from typing import List
 
 import numpy as np
 

src/qusi/train_logging_configuration.py

@@ -1,8 +1,5 @@
 from dataclasses import dataclass
-try:
-    from typing import Any, Dict
-except ImportError:
-    from typing_extensions import Any, Dict
+from typing import Any, Dict
 
 
 @dataclass

src/qusi/train_session.py

@@ -1,8 +1,5 @@
 from pathlib import Path
-try:
-    from typing import List, Optional
-except ImportError:
-    from typing_extensions import List, Optional
+from typing import List, Optional
 
 import numpy as np
 import stringcase

src/qusi/wandb_liaison.py

@@ -1,7 +1,4 @@
-try:
-    from typing import Any, Dict
-except ImportError:
-    from typing_extensions import Any, Dict
+from typing import Any, Dict
 
 import wandb as wandb