Fix mypy

src/grinch/conf.py

@@ -121,7 +121,7 @@ def __init__(self, cfg: Config, /):
         self._reporter = reporter
 
     @property
-    def logs_path(self) -> Path:
+    def logs_path(self) -> Path | None:
         return self.cfg.logs_path
 
     @contextmanager
@@ -131,12 +131,12 @@ def interactive(self, save_path: str | Path | None = None, **kwargs):
         plt.ioff()
 
         if all_not_None(self.logs_path, save_path):
-            self.logs_path.mkdir(parents=True, exist_ok=True)
+            self.logs_path.mkdir(parents=True, exist_ok=True)  # type: ignore
             # Set good defaults
             kwargs.setdefault('dpi', 300)
             kwargs.setdefault('bbox_inches', 'tight')
             kwargs.setdefault('transparent', True)
-            plt.savefig(self.logs_path / save_path, **kwargs)
+            plt.savefig(self.logs_path / save_path, **kwargs)  # type: ignore
 
         plt.clf()
         plt.show()

src/grinch/utils/plotting.py

@@ -1,7 +1,7 @@
 import logging
 
 import matplotlib.pyplot as plt
-import numpy.typing as npt
+import numpy as np
 import seaborn as sns
 from scipy.stats import norm
 
@@ -11,7 +11,7 @@
 
 
 def plot1d(
-    rvs: npt.ArrayLike,
+    rvs: np.ndarray,
     dist: str,
     *,
     title: str | None = None,

src/grinch/utils/stats.py

@@ -1,7 +1,7 @@
 import logging
 from dataclasses import dataclass
 from functools import wraps
-from typing import Any, Dict, Hashable, List, Optional, Tuple, overload
+from typing import Any, Dict, Hashable, List, Tuple, overload
 
 import numpy as np
 import numpy.typing as npt
@@ -101,11 +101,25 @@ def _var(x, axis=None, ddof=0, mean=None):
     return var
 
 
+@overload
 def mean_var(
     x: npt.ArrayLike,
-    axis: Optional[int] = None,
-    ddof: int = 0
-) -> Tuple[int | np.ndarray, int | np.ndarray]:
+    axis: None = None,
+    ddof: int = 0,
+) -> Tuple[float, float]:
+    ...
+
+
+@overload
+def mean_var(
+    x: npt.ArrayLike,
+    axis: int,
+    ddof: int = 0,
+) -> Tuple[np.ndarray, np.ndarray]:
+    ...
+
+
+def mean_var(x, axis=None, ddof=0):
     """Returns both mean and variance.
 
     Parameters
@@ -135,7 +149,7 @@ def mean_var(
 def ttest(
     a: npt.ArrayLike,
     b: npt.ArrayLike,
-    axis: Optional[int] = 0
+    axis: int | None = 0
 ) -> Tuple[np.ndarray, np.ndarray]:
     """Performs a Welch's t-test (unequal sample sizes, unequal vars).
     Extends scipy's ttest_ind to support sparse matrices.