Update black formatting to run on a supported python version & run formatter.

kyleaoman · kyleaoman · commit 25a3acd9106d · 2026-05-06T13:16:59.000+01:00
diff --git a/docs/source/conf.py b/docs/source/conf.py
@@ -16,7 +16,6 @@
 sys.path.insert(0, os.path.abspath("."))
 import velociraptor
 
-
 # -- Project information -----------------------------------------------------
 
 project = "VELOCIraptor Python Tools"
diff --git a/examples/create_hmf.py b/examples/create_hmf.py
@@ -17,8 +17,8 @@
 
 lowest_halo_mass = 1e9 * unyt.msun
 highest_halo_mass = 1e14 * unyt.msun
-lowest_mf = 1e-4 / (unyt.Mpc ** 3)
-highest_mf = 1e1 / (unyt.Mpc ** 3)
+lowest_mf = 1e-4 / (unyt.Mpc**3)
+highest_mf = 1e1 / (unyt.Mpc**3)
 
 box_volume = (float(sys.argv[2]) * unyt.Mpc) ** 3
 
diff --git a/examples/create_smf.py b/examples/create_smf.py
@@ -17,8 +17,8 @@
 
 lowest_stellar_mass = 1e7 * unyt.msun
 highest_stellar_mass = 1e12 * unyt.msun
-lowest_smf = 1e-6 / (unyt.Mpc ** 3)
-highest_smf = 10 ** (-0.5) / (unyt.Mpc ** 3)
+lowest_smf = 1e-6 / (unyt.Mpc**3)
+highest_smf = 10 ** (-0.5) / (unyt.Mpc**3)
 
 box_volume = (float(sys.argv[2]) * unyt.Mpc) ** 3
 
diff --git a/format.sh b/format.sh
@@ -14,13 +14,13 @@ if [ ! -d black_formatting_env ]
 then
   echo "Formatting environment not found, installing it..."
   python3 -m venv black_formatting_env
-  ./black_formatting_env/bin/python3 -m pip install click==8.0.4 black==19.3b0
+  ./black_formatting_env/bin/python3 -m pip install black==26.3.1
 fi
 # Now we know exactly which black to use
 black="./black_formatting_env/bin/python3 -m black"
 
 # Formatting command
-cmd="$black -t py38 $(find . -name '*.py' -not -path './black_formatting_env/*')"
+cmd="$black -t py310 $(find . -name '*.py' -not -path './black_formatting_env/*')"
 
 # Print the help
 function show_help {
diff --git a/tests/test_load_catalogue.py b/tests/test_load_catalogue.py
@@ -7,7 +7,9 @@
 
 
 @requires("cosmo_0000.properties")
-def test_basic_load_catalogue_no_crash(filename="test_data/cosmo_0000.properties",):
+def test_basic_load_catalogue_no_crash(
+    filename="test_data/cosmo_0000.properties",
+):
     catalogue = load(filename)
 
     return
diff --git a/velociraptor/autoplotter/__init__.py b/velociraptor/autoplotter/__init__.py
@@ -56,7 +56,7 @@
          below: number (in same units)
          above: number
      # Lines that you can plot on top - line_type can be median or mean
-     line_type: 
+     line_type:
        plot: true/false (true by default) actually plot this?
        log: true/false (true by default) use log bins?
        scatter: "none", "errorbar", "errorbar_both", or "shaded". Defaults to shaded
diff --git a/velociraptor/autoplotter/lines.py b/velociraptor/autoplotter/lines.py
@@ -286,8 +286,10 @@ def create_line(
                 masked_x, self.bins, box_volume=box_volume
             )
             if self.box_size_correction is not None:
-                mass_function_output = self.box_size_correction.apply_mass_function_correction(
-                    mass_function_output
+                mass_function_output = (
+                    self.box_size_correction.apply_mass_function_correction(
+                        mass_function_output
+                    )
                 )
             self.output = (
                 *mass_function_output,
@@ -334,8 +336,10 @@ def create_line(
                 return_bin_edges=True,
             )
             if self.box_size_correction is not None:
-                mass_function_output = self.box_size_correction.apply_mass_function_correction(
-                    mass_function_output
+                mass_function_output = (
+                    self.box_size_correction.apply_mass_function_correction(
+                        mass_function_output
+                    )
                 )
             self.output = (
                 *mass_function_output,
@@ -356,7 +360,6 @@ def highlight_data_outside_domain(
         x_lim: List,
         y_lim: List,
     ) -> None:
-
         """
         Add arrows to the plot for each data point residing outside the plot's domain.
         The arrows indicate where the missing points are. For a given missing data point
@@ -581,9 +584,9 @@ def plot_line(
         if self.scatter == "none" or errors is None:
             (line,) = ax.plot(centers, heights, label=label)
         elif self.scatter == "errorbar":
-            (line, *_) = ax.errorbar(centers, heights, yerr=errors, label=label)
+            line, *_ = ax.errorbar(centers, heights, yerr=errors, label=label)
         elif self.scatter == "errorbar_both":
-            (line, *_) = ax.errorbar(
+            line, *_ = ax.errorbar(
                 centers,
                 heights,
                 yerr=errors,
diff --git a/velociraptor/autoplotter/metadata.py b/velociraptor/autoplotter/metadata.py
@@ -54,7 +54,7 @@ def _parse_line(self):
     def to_dict(self):
         """
         Convert the contents of this into a dictionary (not using
-        __dict__ as that is used for hashing and I don't want to 
+        __dict__ as that is used for hashing and I don't want to
         mess with that here)
         """
 
@@ -71,9 +71,9 @@ def to_dict(self):
             additional_points_x_units=str(self.additional_x.units),
             additional_points_y=self.additional_y.value.tolist(),
             additional_points_y_units=str(self.additional_y.units),
-            bins_x=self.line.bins.value.tolist()
-            if self.line.bins is not None
-            else None,
+            bins_x=(
+                self.line.bins.value.tolist() if self.line.bins is not None else None
+            ),
             bins_x_units=str(
                 self.line.bins.units if self.line.bins is not None else None
             ),
diff --git a/velociraptor/autoplotter/plot.py b/velociraptor/autoplotter/plot.py
@@ -45,7 +45,7 @@ def histogram_x_against_y(
 ) -> Tuple[plt.Figure, plt.Axes]:
     """
     Creates a plot of x against y with a 2d histogram in the background.
-    
+
     Actually uses pcolormesh and the numpy histogram method.
     """
 
diff --git a/velociraptor/catalogue/registration.py b/velociraptor/catalogue/registration.py
@@ -1357,7 +1357,7 @@ def registration_stellar_birth_densities(
     if not field_path[:14] == "BirthDensities" and field_path[-4:] == "star":
         raise RegistrationDoesNotMatchError
 
-    unit = unit_system.mass / unit_system.length ** 3
+    unit = unit_system.mass / unit_system.length**3
 
     # Need to do a regex search (average, min, max)
     match_string = "BirthDensities_([a-z]+)_star"
@@ -1390,7 +1390,7 @@ def registration_snii_thermal_feedback_densities(
     ):
         raise RegistrationDoesNotMatchError
 
-    unit = unit_system.mass / unit_system.length ** 3
+    unit = unit_system.mass / unit_system.length**3
 
     # Need to do a regex search (average, min, max)
     match_string = "DensitiesAtLastSupernovaEvent_([a-z]+)_gas"
diff --git a/velociraptor/catalogue/soap_catalogue.py b/velociraptor/catalogue/soap_catalogue.py
@@ -375,7 +375,7 @@ def _register_elements(self, handle: h5py.File):
         of this group in the SOAP HDF5 file.
         """
         h5group = handle[self.name] if self.name != "" else handle["/"]
-        for (key, h5obj) in h5group.items():
+        for key, h5obj in h5group.items():
             if key == "Cells":
                 continue
             if isinstance(h5obj, h5py.Group):
@@ -549,9 +549,9 @@ def _register_quantities(self):
             boxsize *= boxsize_unit
             physical_boxsize = self.a * boxsize
             self.units.box_length = boxsize
-            self.units.comoving_box_volume = boxsize ** 3
+            self.units.comoving_box_volume = boxsize**3
             self.units.period = physical_boxsize
-            self.units.physical_box_volume = physical_boxsize ** 3
+            self.units.physical_box_volume = physical_boxsize**3
             self.units.cosmology = self.cosmology
 
     def get_SOAP_quantity(self, quantity_name: str) -> unyt.unyt_array:
diff --git a/velociraptor/catalogue/translator.py b/velociraptor/catalogue/translator.py
@@ -1512,7 +1512,7 @@ def typo_correct(particle_property_name: str):
 
 def get_aperture_unit(unit_name: str, unit_system: VelociraptorUnits):
     """
-    Converts the velociraptor strings to internal velociraptor units 
+    Converts the velociraptor strings to internal velociraptor units
     from the naming convention in the velociraptor files.
     """
 
diff --git a/velociraptor/fitting_formulae/smhmr.py b/velociraptor/fitting_formulae/smhmr.py
@@ -75,7 +75,7 @@ def moster_raw(z, Mhalo):
     beta = beta_10 + beta_11 * z / (z + 1)
     gama = gama_10 + gama_11 * z / (z + 1)
 
-    M_1 = 10 ** log_M_1
+    M_1 = 10**log_M_1
 
     # Equation 2
     Mstar_over_Mhalo = 2.0 * N * ((Mhalo / M_1) ** -beta + (Mhalo / M_1) ** gama) ** -1
@@ -128,7 +128,7 @@ def behroozi_raw(z, Mhalo):
     Provided by Matthieu Schaller.
     """
     aexp = 1.0 / (1.0 + z)
-    nu = np.exp(-4.0 * aexp ** 2)
+    nu = np.exp(-4.0 * aexp**2)
     mh = Mhalo
     m1_0 = 11.514
     m1_a = -1.793
@@ -161,7 +161,7 @@ def behroozi_raw(z, Mhalo):
         np.log10(1.0 + np.exp(x0))
     ) ** gamma / (1.0 + np.exp(10.0 ** (-1.0 * x0)))
     logmstar = np.log10(eps * m1) + f - f0
-    return 10.0 ** logmstar
+    return 10.0**logmstar
 
 
 def behroozi_2019_raw(z, Mhalo):
@@ -247,4 +247,4 @@ def behroozi_2019_raw(z, Mhalo):
         + zparams["gamma"] * np.exp(-0.5 * (dm2 * dm2))
     )
 
-    return 10.0 ** logmstar
+    return 10.0**logmstar
diff --git a/velociraptor/observations/__init__.py b/velociraptor/observations/__init__.py
@@ -70,7 +70,7 @@ def load_observations(
         file overlap with this bracket, they are returned. By default, this
         bracket is 0.0 to 1000.0, so will encompass all reasonable
         observations present in the file.
-    
+
 
     Returns
     -------
diff --git a/velociraptor/observations/objects.py b/velociraptor/observations/objects.py
@@ -567,7 +567,7 @@ def associate_citation(self, citation: str, bibcode: str):
     def associate_name(self, name: str):
         """
         Associate a name with this observational data instance.
-        
+
         Parameters
         ----------
 
@@ -729,12 +729,12 @@ def plot_on_axes(self, axes: Axes, errorbar_kwargs: Union[dict, None] = None):
                 self.y,
                 yerr=self.y_scatter,
                 xerr=self.x_scatter,
-                lolims=self.lower_limits.value
-                if self.lower_limits is not None
-                else None,
-                uplims=self.upper_limits.value
-                if self.upper_limits is not None
-                else None,
+                lolims=(
+                    self.lower_limits.value if self.lower_limits is not None else None
+                ),
+                uplims=(
+                    self.upper_limits.value if self.upper_limits is not None else None
+                ),
                 **kwargs,
                 label=data_label,
             )
@@ -819,7 +819,7 @@ def get_datasets_overlapping_with(
             range [0.0, 1000.0], and hence should overlap with all
             reasonable datasets.
 
-        
+
         Notes
         -----
 
@@ -910,7 +910,7 @@ def associate_citation(self, citation: str, bibcode: str):
     def associate_name(self, name: str):
         """
         Associate a name with this observational data instance.
-        
+
         Parameters
         ----------
 
diff --git a/velociraptor/particles/__init__.py b/velociraptor/particles/__init__.py
@@ -1,5 +1,5 @@
 """
-Velociraptor particles interaction functions. These allow users to 
+Velociraptor particles interaction functions. These allow users to
 extract the particles belonging to, e.g. a single halo.
 """
 
diff --git a/velociraptor/tools/adaptive.py b/velociraptor/tools/adaptive.py
@@ -5,7 +5,6 @@
 import numpy as np
 import unyt
 
-
 adaptive_bin_cache = {}
 
 
@@ -52,7 +51,7 @@ def create_adaptive_bins(
 
     lowest_value: unyt.unyt_quantity
         the lowest value edge of the bins
-    
+
     highest_value: unyt.unyt_quantity
         the highest value edge of the bins
 
@@ -209,7 +208,7 @@ def create_adaptive_bins(
     try:
         if logarithmic:
             bin_centers = unyt.unyt_array(
-                [10 ** x for x in bin_medians], units=values.units, name=values.name
+                [10**x for x in bin_medians], units=values.units, name=values.name
             )
 
             bin_edges = unyt.unyt_array(
diff --git a/velociraptor/tools/histogram.py b/velociraptor/tools/histogram.py
@@ -107,7 +107,7 @@ def create_histogram(
 
     lowest_mass: unyt.unyt_quantity
         the lowest mass edge of the bins
-    
+
     highest_mass: unyt.unyt_quantity
         the highest mass edge of the bins
 
diff --git a/velociraptor/tools/labels.py b/velociraptor/tools/labels.py
@@ -30,7 +30,7 @@ def get_mass_function_label_no_units(mass_function_sub_label: str):
     """
 
     output = (
-        fr"d$n(M_{mass_function_sub_label})$/d$\log_{{10}}M_{mass_function_sub_label}$"
+        rf"d$n(M_{mass_function_sub_label})$/d$\log_{{10}}M_{mass_function_sub_label}$"
     )
 
     return output
@@ -50,7 +50,7 @@ def get_mass_function_label(
     unit_repr = mass_function_units.latex_representation()
     mass_func_label = get_mass_function_label_no_units(mass_function_sub_label)
 
-    output = fr"{mass_func_label} $\left[{unit_repr}\right]$"
+    output = rf"{mass_func_label} $\left[{unit_repr}\right]$"
 
     return output
 
@@ -64,6 +64,6 @@ def get_luminosity_function_label_no_units(luminosity_function_sub_label: str):
     (this would be for an input of "*" and unyt.Mpc**3).
     """
 
-    output = fr"$\phi(M_{luminosity_function_sub_label})$"
+    output = rf"$\phi(M_{luminosity_function_sub_label})$"
 
     return output
diff --git a/velociraptor/tools/luminosity_functions.py b/velociraptor/tools/luminosity_functions.py
@@ -94,7 +94,7 @@ def create_luminosity_function(
 
     lowest_magnitude: unyt.unyt_quantity
         the lowest magnitude edge of the bins
-    
+
     highest_magnitude: unyt.unyt_quantity
         the highest magnitude edge of the bins
 
diff --git a/velociraptor/tools/mass_functions.py b/velociraptor/tools/mass_functions.py
@@ -94,7 +94,7 @@ def create_mass_function(
 
     lowest_mass: unyt.unyt_quantity
         the lowest mass edge of the bins
-    
+
     highest_mass: unyt.unyt_quantity
         the highest mass edge of the bins
 
@@ -169,7 +169,7 @@ def create_adaptive_mass_function(
 
     lowest_mass: unyt.unyt_quantity
         the lowest mass edge of the bins
-    
+
     highest_mass: unyt.unyt_quantity
         the highest mass edge of the bins
 
@@ -314,7 +314,7 @@ def create_adaptive_mass_function(
     error = unyt.unyt_array(error, units=error_units)
 
     bin_centers = unyt.unyt_array(
-        [10 ** x for x in bin_medians], units=masses.units, name=masses.name
+        [10**x for x in bin_medians], units=masses.units, name=masses.name
     )
 
     if return_bin_edges:
diff --git a/velociraptor/velociraptor_compute_box_size_correction.py b/velociraptor/velociraptor_compute_box_size_correction.py
@@ -113,8 +113,8 @@ def velociraptor_compute_box_size_correction():
     large_y_range = large_spline(x_range)
 
     if log_y:
-        small_y_range = 10.0 ** small_y_range
-        large_y_range = 10.0 ** large_y_range
+        small_y_range = 10.0**small_y_range
+        large_y_range = 10.0**large_y_range
 
     correction = large_y_range / small_y_range
 
