Merge pull request #7533 from nilsvu/upgrade_black

Upgrade black Python formatting

Author: nilsdeppe

.skills/scripts/FetchPrComments.py

@@ -92,10 +92,8 @@ def fetch_review_threads(pr_number, repo=None):
 
     if threads_data.get("pageInfo", {}).get("hasNextPage"):
         print(
-            (
-                "WARNING: PR has more than 100 review threads. "
-                "Only the first 100 are shown."
-            ),
+            "WARNING: PR has more than 100 review threads. "
+            "Only the first 100 are shown.",
             file=sys.stderr,
         )
 

pyproject.toml

@@ -7,13 +7,15 @@ build-backend = "setuptools.build_meta"
 
 [tool.black]
 line-length = 80
-target-version = ["py37", "py38", "py39", "py310", "py311"]
-required-version = "23.3.0"
+target-version = ["py310", "py311", "py312", "py313", "py314"]
+required-version = "26.5.1"
 # Enable experimental string processing so long strings are wrapped
-# automatically. This is very convenient but not quite stable yet. Stability of
-# this feature is tracked in this issue:
+# automatically. This is very convenient but not quite stable yet, so black
+# keeps it in its "unstable" tier that has to be enabled explicitly on top of
+# the "preview" style. Stability of this feature is tracked in this issue:
 # https://github.com/psf/black/issues/2188
 preview = true
+enable-unstable-feature = ["string_processing"]
 # Skip external code since modifying it can be an issue with GPL-licensed code.
 extend-exclude = '''
 (

setup.cfg

@@ -12,7 +12,7 @@ license = MIT
 [options]
 packages = find:
 install_requires = @SPECTRE_PY_DEPS_OUTPUT@
-python_requires = >=3.8
+python_requires = >=3.10
 
 [options.extras_require]
 dev = @SPECTRE_PY_DEV_DEPS_OUTPUT@

src/IO/H5/Python/CombineH5.py

@@ -106,10 +106,8 @@ def combine_h5_vol_command(
     if not subfile_name:
         spectre_file = spectre_h5.H5File(h5files[0], "r")
         raise RequiredChoiceError(
-            (
-                "Specify '--subfile-name' / '-d' to select a"
-                " subfile containing volume data."
-            ),
+            "Specify '--subfile-name' / '-d' to select a"
+            " subfile containing volume data.",
             choices=spectre_file.all_vol_files(),
         )
 

src/IO/H5/Python/IterElements.py

@@ -113,7 +113,7 @@ def det_jacobian(self):
 
 
 def stripped_element_name(
-    element_id: Union[str, ElementId[1], ElementId[2], ElementId[3]]
+    element_id: Union[str, ElementId[1], ElementId[2], ElementId[3]],
 ) -> bool:
     """The element name without the leading and trailing square bracket
 

src/IO/H5/Python/OpenVolfiles.py

@@ -192,10 +192,8 @@ def command(
                     )
                 else:
                     raise RequiredChoiceError(
-                        (
-                            "Specify '--subfile-name' / '-d' to select a"
-                            " subfile containing volume data."
-                        ),
+                        "Specify '--subfile-name' / '-d' to select a"
+                        " subfile containing volume data.",
                         choices=available_subfiles,
                     )
 

src/IO/H5/Python/TransformVolumeData.py

@@ -915,10 +915,8 @@ def shift_magnitude(
             )
         else:
             raise RequiredChoiceError(
-                (
-                    "Specify '--subfile-name' / '-d' to select a"
-                    " subfile containing volume data."
-                ),
+                "Specify '--subfile-name' / '-d' to select a"
+                " subfile containing volume data.",
                 choices=available_subfile_names,
             )
 

src/Visualization/Python/GenerateTetrahedralConnectivity.py

@@ -88,10 +88,8 @@ def generate_tetrahedral_connectivity(
             )
         else:
             raise RequiredChoiceError(
-                (
-                    "Specify '--subfile-name' / '-d' to select a"
-                    " subfile containing volume data."
-                ),
+                "Specify '--subfile-name' / '-d' to select a"
+                " subfile containing volume data.",
                 choices=subfiles,
             )
 

src/Visualization/Python/GenerateXdmf.py

@@ -560,10 +560,8 @@ def generate_xdmf(
             )
         else:
             raise RequiredChoiceError(
-                (
-                    "Specify '--subfile-name' / '-d' to select a"
-                    " subfile containing volume data."
-                ),
+                "Specify '--subfile-name' / '-d' to select a"
+                " subfile containing volume data.",
                 choices=subfiles,
             )
 

src/Visualization/Python/PlotCce.py

@@ -128,10 +128,8 @@ def plot_cce(
         cce_subfile = h5file.get(cce_subfile_name)
         if cce_subfile is None:
             raise RequiredChoiceError(
-                (
-                    f"Could not find Cce subfile {cce_subfile} in H5 file"
-                    f" {h5_filename}."
-                ),
+                f"Could not find Cce subfile {cce_subfile} in H5 file"
+                f" {h5_filename}.",
                 choices=cce_subfiles,
             )