fix conflicts

.pre-commit-config.yaml

@@ -9,14 +9,14 @@ ci:
   submodules: false
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.6.1 # Ruff version
+    rev: v0.9.1 # Ruff version
     hooks:
       - id: ruff
         args: [--fix, --extend-ignore=E203]
       - id: ruff-format
         args: [ --line-length=80 ]
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
       - id: check-yaml
       - id: end-of-file-fixer

flowermd/base/molecule.py

@@ -525,8 +525,7 @@ def _build(self, length):
                 self.periodic_bond_axis, str
             ) or self.periodic_bond_axis.lower() not in ["x", "y", "z"]:
                 raise ValueError(
-                    "Valid choices for a `periodic_bond_axis` are "
-                    "'x', 'y', 'z'"
+                    "Valid choices for a `periodic_bond_axis` are 'x', 'y', 'z'"
                 )
             add_hydrogens = False
         else:

flowermd/base/simulation.py

@@ -73,8 +73,7 @@ def __init__(
     ):
         if not isinstance(forcefield, Iterable) or isinstance(forcefield, str):
             raise ValueError(
-                "forcefield must be a sequence of "
-                "hoomd.md.force.Force objects."
+                "forcefield must be a sequence of hoomd.md.force.Force objects."
             )
         else:
             for obj in forcefield:

flowermd/base/system.py

@@ -660,8 +660,7 @@ def __init__(
         if not isinstance(density, u.array.unyt_quantity):
             self.density = density * u.Unit("g") / u.Unit("cm**3")
             warnings.warn(
-                "Units for density were not given, assuming "
-                "units of g/cm**3."
+                "Units for density were not given, assuming units of g/cm**3."
             )
         else:
             self.density = density

flowermd/modules/surface_wetting/surface_wetting.py

@@ -102,8 +102,7 @@ def run_droplet(
             shrink_density, u.array.unyt_quantity
         ) and not isinstance(final_density, u.array.unyt_quantity):
             warnings.warn(
-                "Units for density were not given, assuming "
-                "units of g/cm**3."
+                "Units for density were not given, assuming units of g/cm**3."
             )
             target_box_shrink = get_target_box_mass_density(
                 density=shrink_density * (u.g / (u.cm**3)),