Merge pull request #179 from jku/switch-from-black-to-ruff

Switch from black to ruff
theupdateframework · Feb 2, 2024 · 0d0dff4 · 0d0dff4
2 parents 4ae5fdf + 73e4317
commit 0d0dff4
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 22 deletions.
diff --git a/signer/tuf_on_ci_sign/_signer_repository.py b/signer/tuf_on_ci_sign/_signer_repository.py
@@ -397,18 +397,18 @@ def set_online_config(self, online_config: OnlineConfig):
             root.add_key(online_config.key, "snapshot")
 
             # set online role periods
-            timestamp.unrecognized_fields["x-tuf-on-ci-expiry-period"] = (
-                online_config.timestamp_expiry
-            )
-            timestamp.unrecognized_fields["x-tuf-on-ci-signing-period"] = (
-                online_config.timestamp_signing
-            )
-            snapshot.unrecognized_fields["x-tuf-on-ci-expiry-period"] = (
-                online_config.snapshot_expiry
-            )
-            snapshot.unrecognized_fields["x-tuf-on-ci-signing-period"] = (
-                online_config.snapshot_signing
-            )
+            timestamp.unrecognized_fields[
+                "x-tuf-on-ci-expiry-period"
+            ] = online_config.timestamp_expiry
+            timestamp.unrecognized_fields[
+                "x-tuf-on-ci-signing-period"
+            ] = online_config.timestamp_signing
+            snapshot.unrecognized_fields[
+                "x-tuf-on-ci-expiry-period"
+            ] = online_config.snapshot_expiry
+            snapshot.unrecognized_fields[
+                "x-tuf-on-ci-signing-period"
+            ] = online_config.snapshot_signing
 
     def get_role_config(self, rolename: str) -> OfflineConfig | None:
         """Read configuration for delegation and role from metadata"""
@@ -546,12 +546,12 @@ def set_role_config(
             if expiry == config.expiry_period and signing == config.signing_period:
                 raise AbortEdit(f"No changes to {rolename}")
 
-            signed.unrecognized_fields["x-tuf-on-ci-expiry-period"] = (
-                config.expiry_period
-            )
-            signed.unrecognized_fields["x-tuf-on-ci-signing-period"] = (
-                config.signing_period
-            )
+            signed.unrecognized_fields[
+                "x-tuf-on-ci-expiry-period"
+            ] = config.expiry_period
+            signed.unrecognized_fields[
+                "x-tuf-on-ci-signing-period"
+            ] = config.signing_period
 
         state_file_path = os.path.join(self._dir, ".signing-event-state")
         if self._invites:

diff --git a/tox.ini b/tox.ini
@@ -8,13 +8,12 @@ deps =
     -e signer/
     ruff
     mypy
-    black
 
 changedir = signer
 commands =
     ruff .
+    ruff format --check --diff .
     mypy .
-    black --check --diff .
 
 [testenv:lint-repo]
 description = Repository Linting
@@ -23,13 +22,12 @@ deps =
     -e repo/
     ruff
     mypy
-    black
 
 changedir = repo
 commands =
     ruff .
+    ruff format --check --diff .
     mypy .
-    black --check --diff .
 
 [testenv:test-repo]
 description = Repository unit tests