From 5ed3e08729c8c5d71f5e0adc9e9247d333db9572 Mon Sep 17 00:00:00 2001 From: golmschenk Date: Sun, 11 Feb 2024 21:24:29 -0500 Subject: [PATCH] Only use typing_extensions for Self --- conftest.py | 3 +-- pyproject.toml | 2 +- src/qusi/finite_standard_light_curve_dataset.py | 6 ++---- src/qusi/finite_standard_light_curve_observation_dataset.py | 6 ++---- src/qusi/finite_test_session.py | 5 +---- src/qusi/hadryss_model.py | 6 ++---- src/qusi/infer_session.py | 5 +---- src/qusi/light_curve.py | 5 +---- src/qusi/light_curve_collection.py | 6 ++---- src/qusi/light_curve_dataset.py | 6 ++---- src/qusi/light_curve_observation.py | 5 +---- src/qusi/light_curve_transforms.py | 5 +---- src/qusi/toy_light_curve_collection.py | 5 +---- src/qusi/train_logging_configuration.py | 5 +---- src/qusi/train_session.py | 5 +---- src/qusi/wandb_liaison.py | 5 +---- 16 files changed, 21 insertions(+), 59 deletions(-) diff --git a/conftest.py b/conftest.py index 6be4fadf..a1b2a5be 100644 --- a/conftest.py +++ b/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. diff --git a/pyproject.toml b/pyproject.toml index af17f060..39750991 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -3,7 +3,7 @@ name = "qusi" dynamic = ["version"] description = "" authors = [ - { name = "golmschenk", email = "greg@olmschenk.com" }, + { name = "Greg Olmschenk", email = "greg@olmschenk.com" }, ] readme = "README.md" requires-python = ">=3.9" diff --git a/src/qusi/finite_standard_light_curve_dataset.py b/src/qusi/finite_standard_light_curve_dataset.py index 581b437d..eb56b81b 100644 --- a/src/qusi/finite_standard_light_curve_dataset.py +++ b/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 diff --git a/src/qusi/finite_standard_light_curve_observation_dataset.py b/src/qusi/finite_standard_light_curve_observation_dataset.py index ef7f7e1d..25e824f8 100644 --- a/src/qusi/finite_standard_light_curve_observation_dataset.py +++ b/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 diff --git a/src/qusi/finite_test_session.py b/src/qusi/finite_test_session.py index d6c575e4..4368ce18 100644 --- a/src/qusi/finite_test_session.py +++ b/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 diff --git a/src/qusi/hadryss_model.py b/src/qusi/hadryss_model.py index 686e760a..7d3f1b97 100644 --- a/src/qusi/hadryss_model.py +++ b/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 diff --git a/src/qusi/infer_session.py b/src/qusi/infer_session.py index a3a11d88..b97fc92d 100644 --- a/src/qusi/infer_session.py +++ b/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 diff --git a/src/qusi/light_curve.py b/src/qusi/light_curve.py index 7c8765d1..397b3331 100644 --- a/src/qusi/light_curve.py +++ b/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 diff --git a/src/qusi/light_curve_collection.py b/src/qusi/light_curve_collection.py index 57554f89..92e50c5b 100644 --- a/src/qusi/light_curve_collection.py +++ b/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 diff --git a/src/qusi/light_curve_dataset.py b/src/qusi/light_curve_dataset.py index b1fb7d51..52b1b082 100644 --- a/src/qusi/light_curve_dataset.py +++ b/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 diff --git a/src/qusi/light_curve_observation.py b/src/qusi/light_curve_observation.py index 703f08dd..62b9361a 100644 --- a/src/qusi/light_curve_observation.py +++ b/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 diff --git a/src/qusi/light_curve_transforms.py b/src/qusi/light_curve_transforms.py index 69817ea1..52d183ad 100644 --- a/src/qusi/light_curve_transforms.py +++ b/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 diff --git a/src/qusi/toy_light_curve_collection.py b/src/qusi/toy_light_curve_collection.py index adc24215..223f35b2 100644 --- a/src/qusi/toy_light_curve_collection.py +++ b/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 diff --git a/src/qusi/train_logging_configuration.py b/src/qusi/train_logging_configuration.py index 408daf04..6d5e353f 100644 --- a/src/qusi/train_logging_configuration.py +++ b/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 diff --git a/src/qusi/train_session.py b/src/qusi/train_session.py index 5a8652ac..c6d80489 100644 --- a/src/qusi/train_session.py +++ b/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 diff --git a/src/qusi/wandb_liaison.py b/src/qusi/wandb_liaison.py index e8a12d27..db6a9a17 100644 --- a/src/qusi/wandb_liaison.py +++ b/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