fix pre-commit errors

Author: Bradley Augstein

heracles/catalog/base.py

@@ -440,7 +440,7 @@ def where(self, selection, visibility=None):
 
     @property
     def page_size(self):
-        """number of rows per page (default: 100_000)"""
+        """number of rows per page (default: 1_000_000)"""
         return self._page_size
 
     @page_size.setter

heracles/fields.py

@@ -69,11 +69,10 @@ class Field(metaclass=ABCMeta):
         super().__init_subclass__()
         cls.__spin = spin'''
 
-
     def __init__(
         self,
         mapper: Mapper | None,
-        *columns: str, 
+        *columns: str,
         weight: str | None = None,
         mask: str | None = None,
     ) -> None:
@@ -83,13 +82,13 @@ def __init__(
         self.__columns = columns if columns else None
         self.__weight = weight if weight else None
         self.__mask = mask
-        self.__spin = 0 
+        self.__spin = 0
 
     @property
     def mapper(self) -> Mapper | None:
         """Return the mapper used by this field."""
         return self.__mapper
-    
+
     @property
     def weight(self) -> str | None:
         """Return the mapper used by this field."""
@@ -118,15 +117,18 @@ async def __call__(
     ) -> ArrayLike:
         """Implementation for mapping a catalogue."""
         ...
-    
+
     def CheckColumns(self, *expected):
-        if(self.columns==None):
-            raise ValueError("No columns defined!")
-        if(len(expected)!=len(self.columns)):
+        if self.columns is None:
+            msg = "No columns defined!"
+            raise ValueError(msg)
+        if len(expected) != len(self.columns):
             error = "Column error.  Expected " + str(len(expected)) + " columns"
-            error += " with a format " + str(expected) + ". Received  " + str(self.columns)
+            error += (
+                " with a format " + str(expected) + ". Received  " + str(self.columns)
+            )
             raise ValueError(error)
-        
+
 
 async def _pages(
     catalog: Catalog,
@@ -166,7 +168,7 @@ def __init__(
         mask: str | None = None,
     ) -> None:
         """Create a position field."""
-        super().__init__(mapper, *columns,weight=weight, mask=mask)
+        super().__init__(mapper, *columns, weight=weight, mask=mask)
         self.__overdensity = overdensity
         self.__nbar = nbar
 
@@ -198,15 +200,14 @@ async def __call__(
             msg = "cannot compute density contrast: no visibility in catalog"
             raise ValueError(msg)
 
-        #get mapper
+        # get mapper
         mapper = self.mapper
 
         # get catalogue column definition
         col = self.columns
         self.CheckColumns("longitude", "latitude")
 
-        #if(len(col)!=2):
-        #    raise ValueError("Expect 2 colummns, longitude and latitude")
+        # if(len(col)!=2):
 
         # position map
         pos = mapper.create(spin=self.spin)
@@ -285,7 +286,7 @@ async def __call__(
         # get the column definition of the catalogue
         col = self.columns
         self.CheckColumns("longitude", "latitude", "value")
-        
+
         wcol = self.weight
         # scalar field map
         val = mapper.create(spin=self.spin)
@@ -355,9 +356,9 @@ async def __call__(
 
         # get the column definition of the catalogue
         col = self.columns
-        
+
         self.CheckColumns("longitude", "latitude", "real", "imag")
-            
+
         wcol = self.weight
 
         # complex map with real and imaginary part
@@ -508,16 +509,17 @@ async def __call__(
 
 class Spin2Field(ComplexField):
     """Spin-2 complex field."""
+
     def __init__(
         self,
         mapper: Mapper | None,
-        *columns: str, 
+        *columns: str,
         weight: str | None,
         mask: str | None = None,
     ) -> None:
         """Initialise the field."""
-        super().__init__(mapper, *columns,weight=weight, mask=mask)
-        self.__spin=2
+        super().__init__(mapper, *columns, weight=weight, mask=mask)
+        self.__spin = 2
 
 
 Shears = Spin2Field

pyproject.toml

@@ -25,6 +25,7 @@ dependencies = [
     "coroutines",
     "fitsio",
     "healpy",
+    "matplotlib",
     "numba",
     "numpy",
 ]

tests/test_fields.py

@@ -78,30 +78,29 @@ def catalog(page):
 
 
 def test_field_abc():
-    from unittest.mock import Mock
-
-    from heracles.fields import Columns, Field
+    from heracles.fields import Field
 
     with pytest.raises(TypeError):
         Field()
 
     class SpinLessField(Field):
-            async def __call__(self):
-                pass
+        async def __call__(self):
+            pass
+
     f = SpinLessField(None, weight=None)
     assert f.spin == 0
 
     class TestField(Field):
         async def __call__(self):
             pass
 
-    f = TestField(None, weight = None)
+    f = TestField(None, weight=None)
 
     assert f.mapper is None
     assert f.columns is None
     assert f.spin == 0
 
-    with pytest.raises(ValueError,match="No columns defined"):
+    with pytest.raises(ValueError, match="No columns defined"):
         f.CheckColumns(None)
 
     with pytest.raises(ValueError):
@@ -326,7 +325,7 @@ def test_complex_field(mapper, catalog):
     }
     print(testdata)
     print(m.dtype.metadata)
-    '''assert m.dtype.metadata == {
+    """assert m.dtype.metadata == {
         "catalog": catalog.label,
         "spin": 2,
         "wbar": pytest.approx(wbar),
@@ -336,7 +335,7 @@ def test_complex_field(mapper, catalog):
         "lmax": mapper.lmax,
         "deconv": mapper.deconvolve,
         "bias": pytest.approx(bias / wbar**2, abs=1e-6),
-    }'''
+    }"""
     np.testing.assert_array_almost_equal(m, 0)
 
 
@@ -345,7 +344,7 @@ def test_weights(mapper, catalog):
 
     npix = 12 * mapper.nside**2
 
-    f = Weights(mapper, "ra", "dec", weight = "w")
+    f = Weights(mapper, "ra", "dec", weight="w")
     m = coroutines.run(f(catalog))
 
     w = next(iter(catalog))["w"]