Merge branch 'main' into paddy/issue-124

glass/ext/__init__.py

@@ -6,6 +6,9 @@
 
 """
 
+import os.path
+from pkgutil import extend_path
+
 
 def _extend_path(path: list[str], name: str) -> list[str]:
     """
@@ -23,9 +26,6 @@ def _extend_path(path: list[str], name: str) -> list[str]:
         The extended path.
 
     """
-    import os.path
-    from pkgutil import extend_path
-
     _pkg, _, _mod = name.partition(".")
 
     return list(

glass/fields.py

@@ -29,6 +29,7 @@
 import collections.abc
 import typing
 import warnings
+from itertools import combinations_with_replacement, product
 
 import healpy as hp
 import numpy as np
@@ -553,8 +554,6 @@ def effective_cls(
         If the shapes of *weights1* and *weights2* are incompatible.
 
     """
-    from itertools import combinations_with_replacement, product
-
     # this is the number of fields
     n = int((2 * len(cls)) ** 0.5)
     if n * (n + 1) // 2 != len(cls):

glass/shells.py

@@ -54,6 +54,7 @@
 
 from cosmology.api import CosmologyConstantsNamespace, StandardCosmology
 
+from glass.core.algorithm import nnls
 from glass.core.array import ndinterp
 
 ArrayLike1D = typing.Union[collections.abc.Sequence[float], npt.NDArray[np.float64]]
@@ -652,8 +653,6 @@ def partition_nnls(
         The partition.
 
     """
-    from glass.core.algorithm import nnls
-
     # make sure nothing breaks
     sumtol = max(sumtol, 1e-4)
 

tests/test_points.py

@@ -20,9 +20,6 @@
 
     import pytest_mock
 
-if typing.TYPE_CHECKING:
-    import collections.abc
-
 
 def catpos(
     pos: collections.abc.Generator[