Merge pull request #495 from bgurney-rh/f39-current

Advance current development environment to Fedora 39
stratis-storage · Nov 29, 2023 · e3b7d87 · e3b7d87
2 parents 1ac8550 + 12ea537
commit e3b7d87
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 10 deletions.
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -41,7 +41,7 @@ jobs:
               ShellCheck
             task: shellcheck
     runs-on: ubuntu-latest
-    container: fedora:38  # CURRENT DEVELOPMENT ENVIRONMENT
+    container: fedora:39  # CURRENT DEVELOPMENT ENVIRONMENT
     steps:
       - uses: actions/checkout@v3
       - name: Install dependencies

diff --git a/dependency_management/set_lower_bounds b/dependency_management/set_lower_bounds
@@ -79,7 +79,7 @@ def _do_updates(explicit_dependencies, manifest_path):
 
         tried = []
         failed = []
-        for (crate, spec) in updatables:
+        for crate, spec in updatables:
             if str(spec) == "*":
                 continue
 
@@ -193,7 +193,7 @@ def main():
         ),
         file=sys.stderr,
     )
-    for (crate, version) in tried:
+    for crate, version in tried:
         print(f"{crate} could not be updated to {version}", file=sys.stderr)
     return 1
 

diff --git a/misc_scripts/filesystem_size_estimate.py b/misc_scripts/filesystem_size_estimate.py
@@ -137,7 +137,11 @@ def _do_one(size, bus, pool_proxy):
     if not real:
         pool_used_pre = None
 
-    ((_, (filesystems)), return_code, return_msg,) = Pool.Methods.CreateFilesystems(
+    (
+        (_, (filesystems)),
+        return_code,
+        return_msg,
+    ) = Pool.Methods.CreateFilesystems(
         pool_proxy,
         {
             "specs": [("fs_name", (True, size))],
@@ -180,7 +184,11 @@ def _print_values(devices):
 
     proxy = bus.get_object(_SERVICE, _TOP_OBJECT, introspect=False)
 
-    ((_, (pool_object_path, _)), return_code, return_msg,) = Manager.Methods.CreatePool(
+    (
+        (_, (pool_object_path, _)),
+        return_code,
+        return_msg,
+    ) = Manager.Methods.CreatePool(
         proxy,
         {
             "name": "pool_name",

diff --git a/misc_scripts/thin_metadata_size_viz.py b/misc_scripts/thin_metadata_size_viz.py
@@ -65,7 +65,7 @@ def build_arrays(block_size, values):
     (x_values, y_values, z_values) = ([], [], [])
     for row in values:
         (x_row, y_row, z_row) = ([], [], [])
-        for (pool_size, num_thins) in row:
+        for pool_size, num_thins in row:
             command = [
                 "thin_metadata_size",
                 f"--block-size={block_size}",

diff --git a/misc_scripts/update_introspection_data.py b/misc_scripts/update_introspection_data.py
@@ -150,7 +150,11 @@ def setup_minimal_object_set(bus):
 
     blockdev_proxy = bus.get_object(_SERVICE, dev_object_paths[0], introspect=False)
 
-    ((_, (filesystems)), return_code, return_msg,) = Pool.Methods.CreateFilesystems(
+    (
+        (_, (filesystems)),
+        return_code,
+        return_msg,
+    ) = Pool.Methods.CreateFilesystems(
         pool_proxy,
         {
             "specs": [("fs_name", (False, ""))],

diff --git a/misc_scripts/update_workflow_config.py b/misc_scripts/update_workflow_config.py
@@ -32,7 +32,6 @@ def search_file(search_key, old_verstring, new_verstring, filename):
 
     with open(filename, "r", encoding="utf-8") as file:
         for line in file:
-
             if search_key in line:
                 templine = line.replace(old_verstring, new_verstring)
                 if new_verstring not in templine:

diff --git a/release_management/create_release.py b/release_management/create_release.py
@@ -333,7 +333,6 @@ def tag_python_library(namespace, name):
 
 
 def _create_rust_subcommands(subparsers):
-
     RustCrates.set_up_subcommand(
         "stratisd",
         subparsers,
@@ -373,7 +372,6 @@ def _create_rust_subcommands(subparsers):
 
 
 def _create_python_subcommands(subparsers):
-
     PythonPackages.set_up_subcommand(
         "stratis-cli", subparsers, add_github_release_option=True
     )