stricter ruff due to py311

.gitignore

@@ -15,6 +15,7 @@ __pycache__/
 *.so
 
 # Distribution / packaging
+_version.py
 .Python
 build/
 develop-eggs/

meteor/__init__.py

@@ -0,0 +1,3 @@
+__all__ = ["__version__", "version"]
+
+from ._version import __version__, version

meteor/diffmaps.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Sequence
+from collections.abc import Sequence
 
 import numpy as np
 import reciprocalspaceship as rs

meteor/iterative.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Callable
+from collections.abc import Callable
 
 import numpy as np
 import pandas as pd

meteor/rsmap.py

@@ -1,7 +1,8 @@
 from __future__ import annotations
 
+from collections.abc import Callable
 from pathlib import Path
-from typing import Any, Callable, ClassVar, Literal, overload
+from typing import Any, ClassVar, Literal, overload
 
 import gemmi
 import numpy as np

meteor/scale.py

@@ -1,15 +1,13 @@
 from __future__ import annotations
 
-from typing import Tuple
-
 import numpy as np
 import pandas as pd
 import reciprocalspaceship as rs
 import scipy.optimize as opt
 
 from .rsmap import Map
 
-ScaleParameters = Tuple[float, float, float, float, float, float, float]
+ScaleParameters = tuple[float, float, float, float, float, float, float]
 """ 7x float tuple to hold anisotropic scaling parameters """
 
 

meteor/tv.py

@@ -1,9 +1,10 @@
 from __future__ import annotations
 
 import json
+from collections.abc import Sequence
 from dataclasses import asdict, dataclass
 from pathlib import Path
-from typing import Literal, Sequence, overload
+from typing import Literal, overload
 
 import numpy as np
 from skimage.restoration import denoise_tv_chambolle

meteor/validate.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Callable, Sequence
+from collections.abc import Callable, Sequence
 
 import numpy as np
 from scipy.optimize import minimize_scalar

pyproject.toml

@@ -31,7 +31,7 @@ tests = [
 "meteor.phaseboost" = "meteor.scripts.compute_iterative_tv_map:main"
 
 [tool.setuptools_scm]
-version_file = "meteor/__init__.py"
+version_file = "meteor/_version.py"
 
 [tool.mypy]
 disallow_untyped_calls = true

test/unit/scripts/test_compute_iterative_tv_map.py

@@ -1,8 +1,9 @@
 from __future__ import annotations
 
 import argparse
+from collections.abc import Sequence
 from pathlib import Path
-from typing import Any, Sequence
+from typing import Any
 from unittest import mock
 
 import numpy as np

test/unit/test_diffmaps.py

@@ -1,4 +1,4 @@
-from typing import Callable
+from collections.abc import Callable
 
 import numpy as np
 import pandas as pd

test/unit/test_io.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from typing import Callable
+from collections.abc import Callable
 
 import pytest
 

test/unit/test_tv.py

@@ -1,8 +1,8 @@
 from __future__ import annotations
 
+from collections.abc import Sequence
 from dataclasses import asdict
 from pathlib import Path
-from typing import Sequence
 
 import numpy as np
 import pandas as pd