Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Advance current development environment to Fedora 39 #495

Merged
merged 2 commits into from
Nov 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions dependency_management/set_lower_bounds
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -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

Expand Down
12 changes: 10 additions & 2 deletions misc_scripts/filesystem_size_estimate.py
Original file line number Diff line number Diff line change
Expand Up @@ -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))],
Expand Down Expand Up @@ -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",
Expand Down
2 changes: 1 addition & 1 deletion misc_scripts/thin_metadata_size_viz.py
Original file line number Diff line number Diff line change
Expand Up @@ -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}",
Expand Down
6 changes: 5 additions & 1 deletion misc_scripts/update_introspection_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -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, ""))],
Expand Down
1 change: 0 additions & 1 deletion misc_scripts/update_workflow_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 0 additions & 2 deletions release_management/create_release.py
Original file line number Diff line number Diff line change
Expand Up @@ -333,7 +333,6 @@ def tag_python_library(namespace, name):


def _create_rust_subcommands(subparsers):

RustCrates.set_up_subcommand(
"stratisd",
subparsers,
Expand Down Expand Up @@ -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
)
Expand Down