chore(deps): bump actions/setup-python from 6 to 7

.github/workflows/check-build.yml

@@ -11,7 +11,7 @@ jobs:
         with:
           fetch-depth: 0
 
-      - uses: actions/setup-python@v6
+      - uses: actions/setup-python@v7
         with:
           python-version: "3.10"
 

.github/workflows/publish-to-pypi.yaml

@@ -13,7 +13,7 @@ jobs:
         with:
           fetch-depth: 0
 
-      - uses: actions/setup-python@v6
+      - uses: actions/setup-python@v7
         with:
           python-version: "3.12"
 

.github/workflows/release-draft.yml

@@ -15,7 +15,7 @@ jobs:
         with:
           fetch-depth: 0
 
-      - uses: actions/setup-python@v6
+      - uses: actions/setup-python@v7
         with:
           python-version: "3.10"
 

.github/workflows/test_suite.yaml

@@ -27,7 +27,7 @@ jobs:
       - uses: actions/checkout@master
         with:
           fetch-depth: 1
-      - uses: actions/setup-python@v6
+      - uses: actions/setup-python@v7
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install uv

.github/workflows/warnings-tests.yaml

@@ -27,7 +27,7 @@ jobs:
       - uses: actions/checkout@master
         with:
           fetch-depth: 1
-      - uses: actions/setup-python@v6
+      - uses: actions/setup-python@v7
         with:
           python-version: ${{ matrix.python-version }}
       - name: Install uv

src/hmf/cosmology/cosmo.py

@@ -94,7 +94,7 @@ def cosmo_model(self, val):
             return get_cosmo(val)
 
         if not isinstance(val, FLRW):
-            raise ValueError("cosmo_model must be an instance of astropy.cosmology.FLRW")
+            raise TypeError("cosmo_model must be an instance of astropy.cosmology.FLRW")
         return val
 
     @_cache.parameter("param")

src/hmf/cosmology/growth_factor.py

@@ -346,7 +346,7 @@ def ode(a, y):
         D = sol["y"][0, :]
 
         if (sol["status"] != 0) or (D.shape[0] != a.shape[0]):
-            raise Exception("The calculation of the growth factor failed.")
+            raise RuntimeError("The calculation of the growth factor failed.")
 
         return (Spline(self._lna, np.log(D)), Spline(D, self._zvec))
 
@@ -692,7 +692,9 @@ class GenMFGrowth(BaseGrowthFactor):
 
     def _validate_assumptions(self, z):
         if not isinstance(self.cosmo, cosmology.LambdaCDM):
-            raise ValueError(
+            # Kept as ValueError (not TypeError): part of the public API contract,
+            # asserted verbatim by tests/test_growth.py::test_unsupported_cosmo.
+            raise ValueError(  # noqa: TRY004
                 "The GenMFGrowth factor is only accurate with a cosmological constant. "
                 "Consider using the ODEGrowthFactor instead."
             )

src/hmf/density_field/transfer_models.py

@@ -185,7 +185,10 @@ def __init__(self, *args, **kwargs):
             super().__init__(*args, **kwargs)
 
             if not isinstance(self.cosmo, (cosmology.LambdaCDM, cosmology.wCDM, cosmology.w0waCDM)):
-                raise ValueError("CAMB will only work with LCDM or wCDM cosmologies")
+                # Kept as ValueError (not TypeError): part of the public API contract,
+                # asserted verbatim by
+                # tests/test_transfer_models.py::test_camb_rejects_non_lcdm_cosmology.
+                raise ValueError("CAMB will only work with LCDM or wCDM cosmologies")  # noqa: TRY004
 
             # Save the CAMB object properly for use
             # Set the cosmology
@@ -374,7 +377,7 @@ def __getstate__(self):
                         stacklevel=2,
                     )
 
-                except Exception:
+                except (pickle.PicklingError, TypeError):
                     warnings.warn(f"CAMB key {pk} is not pickle-able.", stacklevel=2)
 
             # Deepcopy self

src/hmf/halos/mass_definitions.py

@@ -374,7 +374,7 @@ def fnc(x):
             xmin = x_guess / XDELTA_GUESS_FACTORS[i]
             xmax = x_guess * XDELTA_GUESS_FACTORS[i]
             x = sp.optimize.brentq(fnc, xmin, xmax)
-        except Exception as e:
+        except (ValueError, RuntimeError) as e:
             warnings.warn(f"raised following error: {e}", stacklevel=2)
             i += 1
 

src/hmf/mass_function/fitting_functions.py

@@ -219,10 +219,10 @@ class BaseFittingFunction(_framework.Component):
     def __init__(
         self,
         nu2: np.ndarray,
-        m: None | np.ndarray = None,
+        m: np.ndarray | None = None,
         z: float = 0.0,
-        n_eff: None | np.ndarray = None,
-        mass_definition: None | md.BaseMassDefinition = None,
+        n_eff: np.ndarray | None = None,
+        mass_definition: md.BaseMassDefinition | None = None,
         cosmo: csm.FLRW = csm.Planck15,
         delta_c: float = 1.68647,
         **model_parameters,
@@ -1368,7 +1368,13 @@ def __init__(self, **model_parameters):
         super().__init__(**model_parameters)
 
         if not isinstance(self.mass_definition, md.SphericalOverdensity):
-            raise ValueError("The Tinker fitting function is a spherical-overdensity function.")
+            # Kept as ValueError (not TypeError): part of the public API contract, asserted
+            # verbatim (via Tinker08/Tinker10, which share this __init__) by
+            # tests/test_fitting_functions_extra.py::test_tinker08_non_so_raises and
+            # ::test_tinker10_non_so_raises.
+            raise ValueError(  # noqa: TRY004
+                "The Tinker fitting function is a spherical-overdensity function."
+            )
         delta_halo = self.mass_definition.halo_overdensity_mean(self.z, self.cosmo)
 
         if delta_halo not in self.delta_virs:

src/hmf/mass_function/hmf.py

@@ -102,7 +102,7 @@ def __init__(
         dlog10m: float = 0.01,
         hmf_model: str | ff.BaseFittingFunction = ff.Tinker08,
         hmf_params: dict[str, Any] | None = None,
-        mdef_model: None | str | MassDef = None,
+        mdef_model: str | MassDef | None = None,
         mdef_params: dict | None = None,
         delta_c: float = 1.68647,
         filter_model: str | BaseFilter = TopHat,

tests/test_cache.py

@@ -138,7 +138,9 @@ def test_obj_eq_numpy():
 def test_obj_eq_dictlike_keys(monkeypatch):
     def fake_array_equal(a, b):
         if isinstance(a, _DictLike) or isinstance(b, _DictLike):
-            raise ValueError("boom")
+            # Kept as ValueError (not TypeError): this exercises the `except ValueError`
+            # branch in hmf._internals._cache.obj_eq, which only catches ValueError.
+            raise ValueError("boom")  # noqa: TRY004
         return np.array_equal(a, b)
 
     monkeypatch.setattr(cache, "array_equal", fake_array_equal)