Merge branch 'main' into padd/issue-998

Author: paddyroddy

.github/ISSUE_TEMPLATE/documentation.yaml

@@ -16,8 +16,6 @@ body:
     attributes:
       label: What Can be Improved About This Section
       description: Is it incomplete, incorrect or difficult to understand?
-    validations:
-      required: true
   - id: suggestions
     type: textarea
     attributes:

.pre-commit-config.yaml

@@ -4,6 +4,8 @@ ci:
   autofix_prs: false
   autoupdate_commit_msg: "pre-commit.ci: update pre-commit hooks"
   autoupdate_schedule: monthly
+  skip:
+    - ty
 
 exclude: ^uv.lock$
 repos:
@@ -74,14 +76,15 @@ repos:
     rev: v1.7.10
     hooks:
       - id: actionlint
-  - repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.19.1
+  - repo: local
     hooks:
-      - id: mypy
-        additional_dependencies:
-          - array-api-strict~=2.4.1
-          - jaxtyping~=0.3.4
-          - numpy~=2.2.6
+      - id: ty
+        entry: uv run ty check
+        language: python
+        name: ty-check
+        pass_filenames: true
+        types:
+          - python
   - repo: https://github.com/kynan/nbstripout
     rev: 0.8.2
     hooks:

docs/modules/healpix.rst

@@ -0,0 +1,34 @@
+.. module:: glass.healpix
+
+:mod:`glass.healpix` --- Array API compatible HEALPix functions
+===============================================================
+
+.. currentmodule:: glass.healpix
+
+This module contains functions for working with HEALPix maps in an Array API
+compliant manner used with GLASS.
+
+This module should be imported manually if used outside of GLASS::
+
+    import glass.healpix as hp
+
+``healpix`` Functions
+---------------------
+
+.. autofunction:: ang2pix
+.. autofunction:: ang2vec
+.. autofunction:: npix2nside
+.. autofunction:: nside2npix
+.. autofunction:: randang
+
+``healpy`` Functions
+--------------------
+
+.. autofunction:: alm2map
+.. autofunction:: alm2map_spin
+.. autofunction:: almxfl
+.. autofunction:: get_nside
+.. autofunction:: map2alm
+.. autofunction:: pixwin
+.. autofunction:: query_strip
+.. automethod:: Rotator.rotate_map_pixel

docs/modules/index.rst

@@ -9,3 +9,4 @@ Modules
    arraytools
    grf
    harmonics
+   healpix

glass/__init__.py

@@ -41,6 +41,7 @@
     "glass_to_healpix_spectra",
     "grf",
     "harmonics",
+    "healpix",
     "healpix_to_glass_spectra",
     "iternorm",
     "linear_bias",
@@ -79,7 +80,7 @@
     from ._version import __version__
 
 # modules
-from glass import algorithm, arraytools, grf, harmonics
+from glass import algorithm, arraytools, grf, harmonics, healpix
 from glass.fields import (
     check_posdef_spectra,
     cls2cov,

glass/_array_api_utils.py

@@ -315,7 +315,7 @@ def linalg_lstsq(
         xp = array_api_compat.array_namespace(a, b, use_compat=False)
 
         if xp.__name__ in {"numpy", "jax.numpy"}:
-            return xp.linalg.lstsq(a, b, rcond=rcond)  # type: ignore[no-any-return]
+            return xp.linalg.lstsq(a, b, rcond=rcond)
 
         if xp.__name__ == "array_api_strict":
             np = import_numpy(xp.__name__)
@@ -471,13 +471,13 @@ def vectorize(
 
         """
         if xp.__name__ == "numpy":
-            return xp.vectorize(pyfunc, otypes=otypes)  # type: ignore[no-any-return]
+            return xp.vectorize(pyfunc, otypes=otypes)
 
         if xp.__name__ in {"array_api_strict", "jax.numpy"}:
             # Import here to prevent users relying on numpy unless in this instance
             np = import_numpy(xp.__name__)
 
-            return np.vectorize(pyfunc, otypes=otypes)  # type: ignore[no-any-return]
+            return np.vectorize(pyfunc, otypes=otypes)
 
         msg = "the array backend in not supported"
         raise NotImplementedError(msg)
@@ -568,11 +568,11 @@ def ndindex(shape: tuple[int, ...], *, xp: ModuleType) -> np.ndindex:
 
         """
         if xp.__name__ == "numpy":
-            return xp.ndindex(shape)  # type: ignore[no-any-return]
+            return xp.ndindex(shape)
 
         if xp.__name__ in {"array_api_strict", "jax.numpy"}:
             np = import_numpy(xp.__name__)
-            return np.ndindex(shape)  # type: ignore[no-any-return]
+            return np.ndindex(shape)
 
         msg = "the array backend in not supported"
         raise NotImplementedError(msg)
@@ -607,7 +607,7 @@ def tril_indices(
 
         """
         if xp.__name__ in {"numpy", "jax.numpy"}:
-            return xp.tril_indices(n, k=k, m=m)  # type: ignore[no-any-return]
+            return xp.tril_indices(n, k=k, m=m)
 
         if xp.__name__ == "array_api_strict":
             np = import_numpy(xp.__name__)

glass/_rng.py

@@ -46,7 +46,7 @@ def rng_dispatcher(*, xp: ModuleType) -> UnifiedGenerator:
         return glass.jax.Generator(seed=SEED)
 
     if xp.__name__ == "numpy":
-        return xp.random.default_rng(seed=SEED)  # type: ignore[no-any-return]
+        return xp.random.default_rng(seed=SEED)
 
     if xp.__name__ == "array_api_strict":
         return Generator(seed=SEED)
@@ -111,7 +111,7 @@ def random(
 
         """
         dtype = dtype if dtype is not None else self.np.float64
-        return self.ap.asarray(self.rng.random(size, dtype, out))  # type: ignore[arg-type]
+        return self.ap.asarray(self.rng.random(size, dtype, out))  # ty: ignore[no-matching-overload]
 
     def normal(
         self,
@@ -184,7 +184,7 @@ def standard_normal(
 
         """
         dtype = dtype if dtype is not None else self.np.float64
-        return self.ap.asarray(self.rng.standard_normal(size, dtype, out))  # type: ignore[arg-type]
+        return self.ap.asarray(self.rng.standard_normal(size, dtype, out))  # ty: ignore[no-matching-overload]
 
     def uniform(
         self,

glass/algorithm.py

@@ -99,7 +99,7 @@ def nnls(
             q = xpx.at(q)[x <= 0].set(False)
         x = xpx.at(x)[q].set(sq)
         x = xpx.at(x)[~q].set(0)
-    return x
+    return x  # ty: ignore[invalid-return-type]
 
 
 def cov_clip(

glass/arraytools.py

@@ -177,9 +177,9 @@ def trapezoid_product(
     x: FloatArray
     x, _ = f
     for x_, _ in ff:
-        x = xpx.union1d(
-            x[(x >= x_[0]) & (x <= x_[-1])],  # type: ignore[index]
-            x_[(x_ >= x[0]) & (x_ <= x[-1])],  # type: ignore[index]
+        x = xpx.union1d(  # ty: ignore[invalid-assignment]
+            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

@@ -8,16 +8,16 @@
 
 
 class Cosmology(
-    cosmology.api.HasComovingDistance[AnyArray, AnyArray],  # type: ignore[misc]
-    cosmology.api.HasCriticalDensity0[AnyArray],  # type: ignore[misc]
-    cosmology.api.HasGrowthFactor[AnyArray, AnyArray],  # type: ignore[misc]
-    cosmology.api.HasHoverH0[AnyArray, AnyArray],  # type: ignore[misc]
-    cosmology.api.HasHubbleDistance[AnyArray],  # type: ignore[misc]
-    cosmology.api.HasInverseComovingDistance[AnyArray, AnyArray],  # type: ignore[misc]
-    cosmology.api.HasLittleH[AnyArray],  # type: ignore[misc]
-    cosmology.api.HasOmegaM0[AnyArray],  # type: ignore[misc]
-    cosmology.api.HasOmegaM[AnyArray, AnyArray],  # type: ignore[misc]
-    cosmology.api.HasTransverseComovingDistance[AnyArray, AnyArray],  # type: ignore[misc]
+    cosmology.api.HasComovingDistance[AnyArray, AnyArray],  # ty: ignore[invalid-type-arguments]
+    cosmology.api.HasCriticalDensity0[AnyArray],  # ty: ignore[invalid-type-arguments]
+    cosmology.api.HasGrowthFactor[AnyArray, AnyArray],  # ty: ignore[invalid-type-arguments]
+    cosmology.api.HasHoverH0[AnyArray, AnyArray],  # ty: ignore[invalid-type-arguments]
+    cosmology.api.HasHubbleDistance[AnyArray],  # ty: ignore[invalid-type-arguments]
+    cosmology.api.HasInverseComovingDistance[AnyArray, AnyArray],  # ty: ignore[invalid-type-arguments]
+    cosmology.api.HasLittleH[AnyArray],  # ty: ignore[invalid-type-arguments]
+    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,
 ):
     """Cosmology protocol for GLASS."""