static: update to newer black (#2599)

Author: Sergio Schvezov

snapcraft/cli/ci.py

@@ -35,7 +35,7 @@ def cicli():
 @click.option(
     "--refresh",
     is_flag=True,
-    help=("Refresh the macaroon required to be able to push and release to channels"),
+    help="Refresh the macaroon required to be able to push and release to channels",
 )
 def enableci(ci_system, refresh):
     """Enable continuous-integration systems to build and release snaps."""

snapcraft/internal/deltas/_deltas.py

@@ -159,7 +159,7 @@ def _update_progress_indicator(self, proc, progress_indicator):
                 count = 0
             progress_indicator.update(count)
             count += 1
-            time.sleep(.2)
+            time.sleep(0.2)
             ret = proc.poll()
         print("")
         # the caller should finish the progressbar outside
@@ -193,9 +193,13 @@ def make_delta(self, output_dir=None, progress_indicator=None, is_for_test=False
 
         delta_cmd = self.get_delta_cmd(self.source_path, self.target_path, delta_file)
 
-        workdir, stdout_path, stdout_file, stderr_path, stderr_file = self._setup_std_output(
-            delta_file
-        )
+        (
+            workdir,
+            stdout_path,
+            stdout_file,
+            stderr_path,
+            stderr_file,
+        ) = self._setup_std_output(delta_file)
 
         proc = subprocess.Popen(
             delta_cmd, stdout=stdout_file, stderr=stderr_file, cwd=workdir

snapcraft/internal/lifecycle/_packer.py

@@ -126,7 +126,7 @@ def _run_mksquashfs(
                     count = 0
                 progress_indicator.update(count)
                 count += 1
-                time.sleep(.2)
+                time.sleep(0.2)
                 ret = proc.poll()
         print("")
         if ret != 0:

snapcraft/plugins/cmake.py

@@ -140,7 +140,7 @@ def _get_processed_flags(self) -> List[str]:
 
         flags = [_Flag(f) for f in self.options.configflags]
         for flag in flags:
-            if flag.name == ("-DCMAKE_FIND_ROOT_PATH"):
+            if flag.name == "-DCMAKE_FIND_ROOT_PATH":
                 flag.value = "{};{}".format(flag.value, ";".join(build_snap_paths))
                 break
         else:

snapcraft/storeapi/_sca_client.py

@@ -42,10 +42,9 @@ def get_macaroon(self, acls, packages=None, channels=None, expires=None):
 
     @staticmethod
     def _is_needs_refresh_response(response):
-        return response.status_code == requests.codes.unauthorized and response.headers.get(
-            "WWW-Authenticate"
-        ) == (
-            "Macaroon needs_refresh=1"
+        return (
+            response.status_code == requests.codes.unauthorized
+            and response.headers.get("WWW-Authenticate") == "Macaroon needs_refresh=1"
         )
 
     def request(self, *args, **kwargs):
@@ -246,9 +245,9 @@ def get_assertion(self, snap_id, endpoint):
         try:
             response_json = response.json()
         except JSONDecodeError:
-            message = (
-                "Invalid response from the server when getting {}: {} {}"
-            ).format(endpoint, response.status_code, response)
+            message = "Invalid response from the server when getting {}: {} {}".format(
+                endpoint, response.status_code, response
+            )
             logger.debug(message)
             raise errors.StoreValidationError(
                 snap_id, response, message="Invalid response from the server"

snapcraft/storeapi/errors.py

@@ -404,9 +404,8 @@ def __init__(self, response):
         what = "The Snap Store encountered an error while processing your request"
         error_code = response.status_code
         error_text = responses[error_code].lower()
-        action = (
-            "The operational status of the Snap Store can be checked at "
-            "{}".format(_STORE_STATUS_URL)
+        action = "The operational status of the Snap Store can be checked at {}".format(
+            _STORE_STATUS_URL
         )
 
         super().__init__(

tests/fake_servers/api.py

@@ -405,7 +405,7 @@ def snap_close(self, request):
                     "error_list": [
                         {
                             "code": "invalid-field",
-                            "message": ("The 'channels' field content is not valid."),
+                            "message": "The 'channels' field content is not valid.",
                         }
                     ]
                 }

tests/unit/build_providers/multipass/test_instance_info.py

@@ -20,7 +20,7 @@
 
 from snapcraft.internal.build_providers import errors
 from snapcraft.internal.build_providers._multipass._instance_info import (
-    InstanceInfo
+    InstanceInfo,
 )  # noqa: E501
 from tests import unit
 

tests/unit/build_providers/test_errors.py

@@ -326,7 +326,7 @@ class ErrorFormattingTest(unit.TestCase):
             dict(
                 exception=errors.ProviderInstanceNotFoundError,
                 kwargs=dict(instance_name="test-build"),
-                expected_message=("Cannot find an instance named 'test-build'."),
+                expected_message="Cannot find an instance named 'test-build'.",
             ),
         ),
         (

tests/unit/commands/__init__.py

@@ -27,15 +27,11 @@
 _sample_keys = [
     {
         "name": "default",
-        "sha3-384": (
-            "vdEeQvRxmZ26npJCFaGnl-VfGz0lU2jZZkWp_s7E-RxVCNtH2_mtjcxq2NkDKkIp"
-        ),
+        "sha3-384": "vdEeQvRxmZ26npJCFaGnl-VfGz0lU2jZZkWp_s7E-RxVCNtH2_mtjcxq2NkDKkIp",
     },
     {
         "name": "another",
-        "sha3-384": (
-            "JsfToV5hO2eN9l89pYYCKXUioTERrZIIHUgQQd47jW8YNNBskupiIjWYd3KXLY_D"
-        ),
+        "sha3-384": "JsfToV5hO2eN9l89pYYCKXUioTERrZIIHUgQQd47jW8YNNBskupiIjWYd3KXLY_D",
     },
 ]