Fix black formatting

Author: jensens

src/mxdev/processing.py

@@ -231,9 +231,7 @@ def write_dev_sources(fio, packages: dict[str, dict[str, typing.Any]]):
     fio.write("\n\n")
 
 
-def write_dev_overrides(
-    fio, overrides: dict[str, str], package_keys: list[str]
-):
+def write_dev_overrides(fio, overrides: dict[str, str], package_keys: list[str]):
     """Create requirements configuration for overridden packages."""
     fio.write("#" * 79 + "\n")
     fio.write("# mxdev constraint overrides\n")

src/mxdev/vcs/common.py

@@ -106,9 +106,7 @@ def matches(self) -> bool: ...
     def update(self, **kwargs) -> str | None: ...
 
 
-def yesno(
-    question: str, default: bool = True, all: bool = True
-) -> str | bool:
+def yesno(question: str, default: bool = True, all: bool = True) -> str | bool:
     if default:
         question = f"{question} [Yes/no"
         answers: dict[str | bool, tuple] = {
@@ -263,14 +261,18 @@ def _checkout_impl(self, packages: list[str], **kwargs) -> None:
                 kwargs["update"] = False
             else:
                 logger.error(
-                    "Unknown value '{}' for always-checkout option.".format(kwargs["update"])
+                    "Unknown value '{}' for always-checkout option.".format(
+                        kwargs["update"]
+                    )
                 )
                 sys.exit(1)
         kwargs.setdefault("submodules", "always")
         # XXX: submodules is git related, move to GitWorkingCopy
         if kwargs["submodules"] not in ["always", "never", "checkout", "recursive"]:
             logger.error(
-                "Unknown value '{}' for update-git-submodules option.".format(kwargs["submodules"])
+                "Unknown value '{}' for update-git-submodules option.".format(
+                    kwargs["submodules"]
+                )
             )
             sys.exit(1)
         for name in packages:
@@ -328,9 +330,7 @@ def matches(self, source: dict[str, str]) -> bool:
             logger.exception("Can not get matches!")
             sys.exit(1)
 
-    def status(
-        self, source: dict[str, str], **kwargs
-    ) -> str | tuple[str, str]:
+    def status(self, source: dict[str, str], **kwargs) -> str | tuple[str, str]:
         name = source["name"]
         if name not in self.sources:
             logger.error(f"Status failed. No source defined for '{name}'.")

src/mxdev/vcs/git.py

@@ -139,9 +139,7 @@ def git_checkout(self, **kwargs) -> str | None:
         path = str(self.source["path"])
         url = self.source["url"]
         if os.path.exists(path):
-            self.output(
-                (logger.info, f"Skipped cloning of existing package '{name}'.")
-            )
+            self.output((logger.info, f"Skipped cloning of existing package '{name}'."))
             return None
         msg = f"Cloned '{name}' with git"
         if "branch" in self.source:
@@ -205,7 +203,9 @@ def git_switch_branch(
         if "rev" in self.source:
             # A tag or revision was specified instead of a branch
             argv = ["checkout", self.source["rev"]]
-            self.output((logger.info, "Switching to rev '{}'.".format(self.source["rev"])))
+            self.output(
+                (logger.info, "Switching to rev '{}'.".format(self.source["rev"]))
+            )
         elif re.search(rf"^(\*| ) {re.escape(branch)}$", stdout, re.M):
             # the branch is local, normal checkout will work
             argv = ["checkout", branch]
@@ -322,7 +322,9 @@ def checkout(self, **kwargs) -> str | None:
             self.output(
                 (
                     logger.warning,
-                    "Checkout URL for existing package '{}' differs. Expected '{}'.".format(name, self.source["url"]),
+                    "Checkout URL for existing package '{}' differs. Expected '{}'.".format(
+                        name, self.source["url"]
+                    ),
                 )
             )
         return None
@@ -380,13 +382,13 @@ def git_set_pushurl(self, stdout_in, stderr_in) -> tuple[str, str]:
 
         if cmd.returncode != 0:
             raise GitError(
-                "git config remote.{}.pushurl {} \nfailed.\n".format(self._upstream_name, self.source["pushurl"])
+                "git config remote.{}.pushurl {} \nfailed.\n".format(
+                    self._upstream_name, self.source["pushurl"]
+                )
             )
         return (stdout_in + stdout, stderr_in + stderr)
 
-    def git_init_submodules(
-        self, stdout_in, stderr_in
-    ) -> tuple[str, str, list]:
+    def git_init_submodules(self, stdout_in, stderr_in) -> tuple[str, str, list]:
         cmd = self.run_git(["submodule", "init"], cwd=self.source["path"])
         stdout, stderr = cmd.communicate()
         if cmd.returncode != 0:

src/mxdev/vcs/svn.py

@@ -53,11 +53,15 @@ def _normalized_url_rev(self):
             url[2] = path
         if "rev" in self.source and "revision" in self.source:
             raise ValueError(
-                "The source definition of '{}' contains duplicate revision options.".format(self.source["name"])
+                "The source definition of '{}' contains duplicate revision options.".format(
+                    self.source["name"]
+                )
             )
         if rev is not None and ("rev" in self.source or "revision" in self.source):
             raise ValueError(
-                "The url of '{}' contains a revision and there is an additional revision option.".format(self.source["name"])
+                "The url of '{}' contains a revision and there is an additional revision option.".format(
+                    self.source["name"]
+                )
             )
         elif rev is None:
             rev = self.source.get("revision", self.source.get("rev"))
@@ -101,7 +105,9 @@ def _svn_check_version(self):
             sys.exit(1)
         if (version < (1, 5)) and not _svn_version_warning:
             logger.warning(
-                "The installed 'svn' command is too old. Expected 1.5 or newer, got {}.".format(".".join([str(x) for x in version]))
+                "The installed 'svn' command is too old. Expected 1.5 or newer, got {}.".format(
+                    ".".join([str(x) for x in version])
+                )
             )
             _svn_version_warning = True
 
@@ -134,7 +140,9 @@ def _svn_error_wrapper(self, f, **kwargs):
                     common.output_lock.release()
                     continue
                 print(
-                    "Authorization needed for '{}' at '{}'".format(self.source["name"], self.source["url"])
+                    "Authorization needed for '{}' at '{}'".format(
+                        self.source["name"], self.source["url"]
+                    )
                 )
                 user = input("Username: ")
                 passwd = getpass.getpass("Password: ")
@@ -181,7 +189,9 @@ def _svn_checkout(self, **kwargs):
         stdout, stderr, returncode = self._svn_communicate(args, url, **kwargs)
         if returncode != 0:
             raise SVNError(
-                "Subversion checkout for '{}' failed.\n{}".format(name, stderr.decode("utf8"))
+                "Subversion checkout for '{}' failed.\n{}".format(
+                    name, stderr.decode("utf8")
+                )
             )
         if kwargs.get("verbose", False):
             return stdout.decode("utf8")
@@ -339,10 +349,14 @@ def checkout(self, **kwargs):
                     url = self._svn_info().get("url", "")
                     if url:
                         msg = f"The current checkout of '{name}' is from '{url}'."
-                        msg += "\nCan't switch package to '{}' because it's dirty.".format(self.source["url"])
+                        msg += (
+                            "\nCan't switch package to '{}' because it's dirty.".format(
+                                self.source["url"]
+                            )
+                        )
                     else:
-                        msg = (
-                            "Can't switch package '{}' to '{}' because it's dirty.".format(name, self.source["url"])
+                        msg = "Can't switch package '{}' to '{}' because it's dirty.".format(
+                            name, self.source["url"]
                         )
                     raise SVNError(msg)
         else: