gh-983: fix some tying ignore comments

glass/_array_api_utils.py

@@ -17,13 +17,14 @@
 from __future__ import annotations
 
 import functools
-from typing import TYPE_CHECKING, Any
+import typing
 
 import array_api_compat
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from collections.abc import Callable, Sequence
     from types import ModuleType
+    from typing import Any
 
     import numpy as np
 

glass/_rng.py

@@ -10,9 +10,9 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+import typing
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from types import ModuleType
 
     from glass._types import DTypeLike, FloatArray, IntArray, UnifiedGenerator

glass/_types.py

@@ -1,8 +1,9 @@
-from typing import TYPE_CHECKING, Any
+import typing
+from typing import Any
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from collections.abc import Sequence
-    from typing import ParamSpec, TypeAlias, TypeVar
+    from typing import TypeAlias
 
     import jaxtyping
     import numpy as np
@@ -13,9 +14,9 @@
     import glass.jax
     from glass import _rng
 
-    P = ParamSpec("P")
-    R = TypeVar("R")
-    T = TypeVar("T")
+    P = typing.ParamSpec("P")
+    R = typing.TypeVar("R")
+    T = typing.TypeVar("T")
 
     AnyArray: TypeAlias = np.typing.NDArray[Any] | jaxtyping.Array | Array
     ComplexArray: TypeAlias = np.typing.NDArray[np.complex128] | jaxtyping.Array | Array

glass/algorithm.py

@@ -2,13 +2,13 @@
 
 from __future__ import annotations
 
+import typing
 import warnings
-from typing import TYPE_CHECKING
 
 import array_api_compat
 import array_api_extra as xpx
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from glass._types import FloatArray
 
 

glass/arraytools.py

@@ -2,14 +2,14 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+import typing
 
 import array_api_compat
 import array_api_extra as xpx
 
 from glass._array_api_utils import xp_additions as uxpx
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from types import ModuleType
 
     from glass._types import AnyArray, FloatArray, IntArray
@@ -175,9 +175,12 @@ def trapezoid_product(
     x: FloatArray
     x, _ = f
     for x_, _ in ff:
-        x = xpx.union1d(  # ty: ignore[invalid-assignment]
-            x[(x >= x_[0]) & (x <= x_[-1])],
-            x_[(x_ >= x[0]) & (x_ <= x[-1])],
+        x = typing.cast(
+            "FloatArray",
+            xpx.union1d(
+                x[(x >= x_[0]) & (x <= x_[-1])],
+                x_[(x_ >= x[0]) & (x_ <= x[-1])],
+            ),
         )
     y = uxpx.interp(x, *f)
     for f_ in ff:

glass/cosmology.py

@@ -1,6 +1,6 @@
 """Module for cosmology.api utilities."""
 
-from typing import Protocol
+import typing
 
 import cosmology.api
 
@@ -18,6 +18,6 @@ class Cosmology(
     cosmology.api.HasOmegaM0[AnyArray],  # ty: ignore[invalid-type-arguments]
     cosmology.api.HasOmegaM[AnyArray, AnyArray],  # ty: ignore[invalid-type-arguments]
     cosmology.api.HasTransverseComovingDistance[AnyArray, AnyArray],  # ty: ignore[invalid-type-arguments]
-    Protocol,
+    typing.Protocol,
 ):
     """Cosmology protocol for GLASS."""

glass/fields.py

@@ -5,9 +5,9 @@
 import itertools
 import math
 import sys
+import typing
 import warnings
 from collections.abc import Sequence
-from typing import TYPE_CHECKING
 
 import numpy as np
 import transformcl
@@ -23,7 +23,7 @@
 from glass import _rng
 from glass._array_api_utils import xp_additions as uxpx
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from collections.abc import Callable, Generator, Iterable, Iterator, Sequence
     from types import ModuleType
     from typing import Literal
@@ -41,7 +41,7 @@
 if sys.version_info >= (3, 13):
     from warnings import deprecated
 else:
-    if TYPE_CHECKING:
+    if typing.TYPE_CHECKING:
         from glass._types import P, R
 
     def deprecated(msg: str, /) -> Callable[[Callable[P, R]], Callable[P, R]]:
@@ -226,7 +226,7 @@ def cls2cov(
             cov = xpx.at(cov)[:n, i].set(cl)
             cov = xpx.at(cov)[n:, i].set(0.0)
         cov /= 2
-        yield cov  # ty: ignore[invalid-yield]
+        yield typing.cast("FloatArray", cov)
 
 
 def discretized_cls(
@@ -551,7 +551,7 @@ def getcl(
             cl = cl[: lmax + 1]
         else:
             cl = xpx.pad(cl, (0, lmax + 1 - cl.shape[0]))
-    return cl  # ty: ignore[invalid-return-type]
+    return typing.cast("FloatArray", cl)
 
 
 def enumerate_spectra(
@@ -1023,7 +1023,7 @@ def cov_from_spectra(
         cov = xpx.at(cov)[:size, i, j].set(cl_flat[:size])
         cov = xpx.at(cov)[:size, j, i].set(cl_flat[:size])
 
-    return cov  # ty: ignore[invalid-return-type]
+    return typing.cast("AnyArray", cov)
 
 
 def check_posdef_spectra(spectra: AngularPowerSpectra) -> bool:

glass/galaxies.py

@@ -20,8 +20,8 @@
 from __future__ import annotations
 
 import math
+import typing
 import warnings
-from typing import TYPE_CHECKING
 
 import array_api_compat
 import array_api_extra as xpx
@@ -32,7 +32,7 @@
 from glass import _rng
 from glass._array_api_utils import xp_additions as uxpx
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from types import ModuleType
 
     from glass._types import FloatArray, UnifiedGenerator

glass/grf/_core.py

@@ -1,16 +1,16 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING, Protocol
+import typing
 
 import transformcl
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from types import NotImplementedType
 
     from glass._types import AnyArray
 
 
-class Transformation(Protocol):
+class Transformation(typing.Protocol):
     """Protocol for transformations of Gaussian random fields."""
 
     def __call__(self, x: AnyArray, var: float, /) -> AnyArray:

glass/grf/_solver.py

@@ -1,13 +1,13 @@
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+import typing
 
 import numpy as np
 from transformcl import cltocorr, corrtocl
 
 import glass.grf
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from glass._types import AnyArray
 
 

glass/grf/_transformations.py

@@ -1,9 +1,9 @@
 from __future__ import annotations
 
+import typing
 from dataclasses import dataclass
-from typing import TYPE_CHECKING
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from types import NotImplementedType
 
     from glass._types import AnyArray

glass/harmonics.py

@@ -2,11 +2,11 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
+import typing
 
 import array_api_compat
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from glass._types import ComplexArray, FloatArray
 
 

glass/healpix.py

@@ -2,8 +2,8 @@
 
 from __future__ import annotations
 
+import typing
 from collections.abc import Sequence
-from typing import TYPE_CHECKING
 
 import healpix
 import healpy
@@ -14,7 +14,7 @@
 import glass._array_api_utils as _utils
 from glass import _rng
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from types import ModuleType
 
     from glass._types import ComplexArray, DTypeLike, FloatArray, IntArray

glass/jax.py

@@ -4,15 +4,15 @@
 
 import math
 import threading
-from typing import TYPE_CHECKING
+import typing
 
 import jax.dtypes
 import jax.numpy as jnp
 import jax.random
 import jax.scipy
 import jax.typing
 
-if TYPE_CHECKING:
+if typing.TYPE_CHECKING:
     from typing import Self
 
     from jaxtyping import PRNGKeyArray