Ruff linting and formatting

Author: cuza

general_itests/steps/deployments_json_steps.py

@@ -186,9 +186,9 @@ def step_impl_then(context):
             },
         }
     )
-    assert (
-        expected_deployments == deployments
-    ), f"actual: {deployments}\nexpected:{expected_deployments}"
+    assert expected_deployments == deployments, (
+        f"actual: {deployments}\nexpected:{expected_deployments}"
+    )
 
 
 @then('that deployments.json has a desired_state of "{expected_state}"')
@@ -202,9 +202,9 @@ def step_impl_then_desired_state(context, expected_state):
         reverse=True,
     )[0][1]
     desired_state = latest["desired_state"]
-    assert (
-        desired_state == expected_state
-    ), f"actual: {desired_state}\nexpected: {expected_state}"
+    assert desired_state == expected_state, (
+        f"actual: {desired_state}\nexpected: {expected_state}"
+    )
 
 
 @then("the repository should be correctly tagged")

general_itests/steps/validate_steps.py

@@ -28,10 +28,9 @@ def given_service(context, service_type):
 
 @when("we run paasta validate")
 def run_paasta_validate(context):
-    validate_cmd = (
-        "paasta validate "
-        "--yelpsoa-config-root %s "
-        "--service %s " % (context.soa_dir, context.service)
+    validate_cmd = "paasta validate --yelpsoa-config-root %s --service %s " % (
+        context.soa_dir,
+        context.service,
     )
     context.return_code, context.output = _run(command=validate_cmd)
 

k8s_itests/scripts/containerd_registry_setup.py

@@ -3,6 +3,7 @@
 
 import toml
 
+
 containerdcfg_file_path = sys.argv[1]
 containerdcfg = toml.load(containerdcfg_file_path)
 dockercfg = json.load(open("/nail/etc/docker-registry-ro"))

k8s_itests/test_autoscaling.py

@@ -3,6 +3,7 @@
 from k8s_itests.utils import cmd
 from k8s_itests.utils import init_all
 
+
 terminate_on_exit = []
 
 

paasta_tools/api/api.py

@@ -15,6 +15,7 @@
 """
 Responds to paasta service and instance requests.
 """
+
 import argparse
 import contextlib
 import logging
@@ -36,6 +37,7 @@
 from paasta_tools.api.tweens import request_logger
 from paasta_tools.utils import load_system_paasta_config
 
+
 try:
     import clog
 except ImportError:

paasta_tools/api/client.py

@@ -15,6 +15,7 @@
 """
 Client interface for the Paasta rest api.
 """
+
 import logging
 from dataclasses import dataclass
 from typing import Optional
@@ -61,9 +62,9 @@ def get_paasta_oapi_client_by_url(
 
     client = paastaapi.ApiClient(configuration=config)
     # PAASTA-18005: Adds default timeout to paastaapi client
-    client.rest_client.pool_manager.connection_pool_kw[
-        "timeout"
-    ] = load_system_paasta_config().get_api_client_timeout()
+    client.rest_client.pool_manager.connection_pool_kw["timeout"] = (
+        load_system_paasta_config().get_api_client_timeout()
+    )
     # SEC-19555: support auth in PaaSTA APIs
     if auth_token:
         client.set_default_header("Authorization", f"Bearer {auth_token}")

paasta_tools/api/settings.py

@@ -14,6 +14,7 @@
 """
 Settings of the paasta-api server.
 """
+
 import os
 from typing import Optional
 
@@ -22,6 +23,7 @@
 from paasta_tools.utils import DEFAULT_SOA_DIR
 from paasta_tools.utils import SystemPaastaConfig
 
+
 soa_dir: str = os.environ.get("PAASTA_API_SOA_DIR", DEFAULT_SOA_DIR)
 
 # The following `type: ignore` mypy hints are there because variables below de

paasta_tools/api/tweens/__init__.py

@@ -3,4 +3,5 @@
 from pyramid.request import Request
 from pyramid.response import Response
 
+
 Handler = Callable[[Request], Response]

paasta_tools/api/tweens/profiling.py

@@ -14,11 +14,13 @@
 """
 Creates a tween that cprofiles requests
 """
+
 import pyramid
 import pytz
 
 from paasta_tools.api import settings as api_settings
 
+
 try:
     # hackily patch pytz, since yelp_lib (used by yelp_profiling) type checks
     # using an older version of pytz where tzinfo didn't exist yet. this needs to

paasta_tools/api/tweens/request_logger.py

@@ -14,6 +14,7 @@
 """
 Creates a tween that logs information about requests.
 """
+
 import json
 import traceback
 from datetime import datetime
@@ -23,6 +24,7 @@
 
 from paasta_tools.api import settings
 
+
 try:
     import clog
 except ImportError: