gh-441: import directly from glass in tests (#442)

tests/conftest.py

@@ -4,6 +4,4 @@
 
 @pytest.fixture(scope="session")
 def rng() -> np.random.Generator:
-    import numpy as np
-
     return np.random.default_rng(seed=42)

tests/test_fields.py

@@ -1,6 +1,6 @@
 import numpy as np
 
-from glass.fields import getcl
+from glass import getcl
 
 
 def test_getcl() -> None:

tests/test_fits.py

@@ -5,7 +5,7 @@
 import numpy.typing as npt
 import pytest
 
-from glass import user
+from glass import write_catalog
 
 # check if fitsio is available for testing
 HAVE_FITSIO = importlib.util.find_spec("fitsio") is not None
@@ -37,7 +37,7 @@ def _test_append(
             hdu.write(data, names=names, firstrow=hdu.get_nrows())
 
     with (
-        user.write_catalog(tmp_path / filename_gfits, ext="CATALOG") as out,
+        write_catalog(tmp_path / filename_gfits, ext="CATALOG") as out,
         fitsio.FITS(tmp_path / filename_tfits, "rw", clobber=True) as my_fits,
     ):
         for i in range(my_max):
@@ -80,7 +80,7 @@ def raise_error(msg: str) -> None:
         raise TestWriteError(msg)
 
     try:
-        with user.write_catalog(tmp_path / filename, ext="CATALOG") as out:
+        with write_catalog(tmp_path / filename, ext="CATALOG") as out:
             for i in range(my_max):
                 if i == except_int:
                     msg = "Unhandled exception"

tests/test_galaxies.py

@@ -3,7 +3,12 @@
 import pytest
 import pytest_mock
 
-from glass.galaxies import galaxy_shear, gaussian_phz, redshifts, redshifts_from_nz
+from glass import (
+    galaxy_shear,
+    gaussian_phz,
+    redshifts,
+    redshifts_from_nz,
+)
 
 
 def test_redshifts(mocker: pytest_mock.MockerFixture) -> None:

tests/test_lensing.py

@@ -7,13 +7,13 @@
 import numpy.typing as npt
 import pytest
 
-from glass.lensing import (
+from glass import (
     MultiPlaneConvergence,
+    RadialWindow,
     deflect,
     multi_plane_matrix,
     multi_plane_weights,
 )
-from glass.shells import RadialWindow
 
 if typing.TYPE_CHECKING:
     from cosmology import Cosmology

tests/test_points.py

@@ -6,7 +6,7 @@
 import numpy.typing as npt
 import pytest
 
-from glass.points import (
+from glass import (
     effective_bias,
     linear_bias,
     loglinear_bias,

tests/test_shapes.py

@@ -1,7 +1,7 @@
 import numpy as np
 import pytest
 
-from glass.shapes import (
+from glass import (
     ellipticity_gaussian,
     ellipticity_intnorm,
     ellipticity_ryden04,

tests/test_shells.py

@@ -1,7 +1,12 @@
 import numpy as np
 import pytest
 
-from glass.shells import RadialWindow, partition, restrict, tophat_windows
+from glass import (
+    RadialWindow,
+    partition,
+    restrict,
+    tophat_windows,
+)
 
 
 def test_tophat_windows() -> None: