Fix linting issues and reformat code

Author: erral

src/mxdev/config.py

@@ -11,7 +11,6 @@
     from .hooks import Hook
 
 
-
 def to_bool(value):
     if not isinstance(value, str):
         return bool(value)
@@ -73,17 +72,20 @@ def __contains__(self, key):
 def read_toml(path: str | Path) -> TomlWrapper:
     try:
         import tomllib
+
+        loader = tomllib
     except ImportError:
         try:
-            import tomli as tomllib
+            import tomli as toml_backport
+
+            loader = toml_backport  # type: ignore
         except ImportError:
             raise ImportError(
-                "TOML support requires Python 3.11+ or the 'tomli' package. "
-                "Install it with 'pip install mxdev[toml]'."
+                "TOML support requires Python 3.11+ or the 'tomli' package. Install it with 'pip install mxdev[toml]'."
             )
 
     with open(path, "rb") as f:
-        data = tomllib.load(f)
+        data = loader.load(f)
 
     if "tool" not in data or "mxdev" not in data["tool"]:
         return TomlWrapper({"settings": {}})
@@ -117,6 +119,7 @@ def __init__(
         hooks: list["Hook"] = [],
     ) -> None:
         logger.debug("Read configuration")
+        data: typing.Any
         if mxini.endswith(".toml"):
             data = read_toml(mxini)
         else:

src/mxdev/processing.py

@@ -221,9 +221,7 @@ def resolve_dependencies(
                     cache_dir,
                 )
         else:
-            logger.info(
-                f"Can not read {variety_verbose} file '{file_or_url}', " "it does not exist. Empty file assumed."
-            )
+            logger.info(f"Can not read {variety_verbose} file '{file_or_url}', it does not exist. Empty file assumed.")
     else:
         # HTTP(S) URL handling with caching
         content: str
@@ -358,7 +356,7 @@ def write_dev_sources(fio, packages: dict[str, dict[str, typing.Any]], state: St
 
         # Add -e prefix only for 'editable' mode (not for 'fixed')
         prefix = "-e " if package["install-mode"] == "editable" else ""
-        install_line = f"""{prefix}./{package['target']}/{name}{subdir}{extras}"""
+        install_line = f"""{prefix}./{package["target"]}/{name}{subdir}{extras}"""
 
         if not source_path.exists():
             # Source not checked out yet - write as comment

src/mxdev/vcs/bazaar.py

@@ -69,7 +69,7 @@ def checkout(self, **kwargs):
                 self.output((logger.info, f"Skipped checkout of existing package {name!r}."))
             else:
                 raise BazaarError(
-                    "Source URL for existing package {!r} differs. " "Expected {!r}.".format(name, self.source["url"])
+                    "Source URL for existing package {!r} differs. Expected {!r}.".format(name, self.source["url"])
                 )
         else:
             return self.bzr_branch(**kwargs)

src/mxdev/vcs/common.py

@@ -150,8 +150,7 @@ def get_workingcopytypes() -> dict[str, type[BaseWorkingCopy]]:
         workingcopytype = entrypoint.load()
         if key in addons:
             logger.error(
-                f"Duplicate workingcopy types registration '{key}' at "
-                f"{entrypoint.value} can not override {addons[key]}"
+                f"Duplicate workingcopy types registration '{key}' at {entrypoint.value} can not override {addons[key]}"
             )
             sys.exit(1)
         addons[key] = workingcopytype

src/mxdev/vcs/filesystem.py

@@ -24,9 +24,7 @@ def checkout(self, **kwargs) -> str | None:
                 )
             else:
                 raise FilesystemError(
-                    "Directory name for existing package {!r} differs. " "Expected {!r}.".format(
-                        name, self.source["url"]
-                    )
+                    "Directory name for existing package {!r} differs. Expected {!r}.".format(name, self.source["url"])
                 )
         else:
             raise FilesystemError(
@@ -48,7 +46,7 @@ def update(self, **kwargs):
         name = self.source["name"]
         if not self.matches():
             raise FilesystemError(
-                "Directory name for existing package {!r} differs. " "Expected {!r}.".format(name, self.source["url"])
+                "Directory name for existing package {!r} differs. Expected {!r}.".format(name, self.source["url"])
             )
         self.output((logger.info, f"Filesystem package {name!r} doesn't need update."))
         return ""

src/mxdev/vcs/git.py

@@ -29,7 +29,7 @@ def __init__(self, source: dict[str, str]):
         self.git_executable = common.which("git")
         if "rev" in source and "revision" in source:
             raise ValueError(
-                "The source definition of '{}' contains " "duplicate revision options.".format(source["name"])
+                "The source definition of '{}' contains duplicate revision options.".format(source["name"])
             )
         # 'rev' is canonical
         if "revision" in source:
@@ -41,7 +41,7 @@ def __init__(self, source: dict[str, str]):
                 del source["branch"]
             elif "branch" in source:
                 logger.error(
-                    "Cannot specify both branch (%s) and rev/revision " "(%s) in source for %s",
+                    "Cannot specify both branch (%s) and rev/revision (%s) in source for %s",
                     source["branch"],
                     source["rev"],
                     source["name"],

src/mxdev/vcs/mercurial.py

@@ -173,7 +173,7 @@ def checkout(self, **kwargs):
                 self.output((logger.info, f"Skipped checkout of existing package {name!r}."))
             else:
                 raise MercurialError(
-                    "Source URL for existing package {!r} differs. " "Expected {!r}.".format(name, self.source["url"])
+                    "Source URL for existing package {!r} differs. Expected {!r}.".format(name, self.source["url"])
                 )
         else:
             return self.hg_clone(**kwargs)

tests/test_config_discovery.py

@@ -1,21 +1,21 @@
-import os
-from unittest.mock import patch
 from mxdev.main import main
-import pytest
+from unittest.mock import patch
+
 
 def test_discovery_mx_ini_exists(tmp_path, monkeypatch):
     """If mx.ini exists, it should be preferred over pyproject.toml."""
     mxini = tmp_path / "mx.ini"
     mxini.write_text("[settings]\nrequirements-in = mx-reqs.txt", encoding="utf-8")
-    
+
     pyproject = tmp_path / "pyproject.toml"
     pyproject.write_text("[tool.mxdev.settings]\nrequirements-in = toml-reqs.txt", encoding="utf-8")
-    
+
     monkeypatch.chdir(tmp_path)
-    
+
     import sys
+
     main_module = sys.modules["mxdev.main"]
-    
+
     with (
         patch("sys.argv", ["mxdev"]),
         patch.object(main_module, "load_hooks", return_value=[]),
@@ -29,16 +29,18 @@ def test_discovery_mx_ini_exists(tmp_path, monkeypatch):
         mock_config.assert_called_once()
         assert mock_config.call_args[1]["mxini"] == "mx.ini"
 
+
 def test_discovery_pyproject_fallback(tmp_path, monkeypatch):
     """If mx.ini is missing, it should fallback to pyproject.toml."""
     pyproject = tmp_path / "pyproject.toml"
     pyproject.write_text("[tool.mxdev.settings]\nrequirements-in = toml-reqs.txt", encoding="utf-8")
-    
+
     monkeypatch.chdir(tmp_path)
-    
+
     import sys
+
     main_module = sys.modules["mxdev.main"]
-    
+
     with (
         patch("sys.argv", ["mxdev"]),
         patch.object(main_module, "load_hooks", return_value=[]),
@@ -52,19 +54,21 @@ def test_discovery_pyproject_fallback(tmp_path, monkeypatch):
         mock_config.assert_called_once()
         assert mock_config.call_args[1]["mxini"] == "pyproject.toml"
 
+
 def test_discovery_explicit_flag(tmp_path, monkeypatch):
     """Explicit flag should override discovery."""
     mxini = tmp_path / "mx.ini"
     mxini.write_text("[settings]", encoding="utf-8")
-    
+
     custom = tmp_path / "custom.toml"
     custom.write_text("[tool.mxdev.settings]", encoding="utf-8")
-    
+
     monkeypatch.chdir(tmp_path)
-    
+
     import sys
+
     main_module = sys.modules["mxdev.main"]
-    
+
     with (
         patch("sys.argv", ["mxdev", "-c", "custom.toml"]),
         patch.object(main_module, "load_hooks", return_value=[]),
@@ -78,13 +82,15 @@ def test_discovery_explicit_flag(tmp_path, monkeypatch):
         mock_config.assert_called_once()
         assert mock_config.call_args[1]["mxini"] == "custom.toml"
 
+
 def test_discovery_no_config(tmp_path, monkeypatch):
     """If no config found, fallback to mx.ini default (to trigger existing error behavior)."""
     monkeypatch.chdir(tmp_path)
-    
+
     import sys
+
     main_module = sys.modules["mxdev.main"]
-    
+
     with (
         patch("sys.argv", ["mxdev"]),
         patch.object(main_module, "load_hooks", return_value=[]),

tests/test_toml.py

@@ -1,11 +1,14 @@
+from mxdev.config import Configuration
+from mxdev.config import read_toml
+from unittest.mock import patch
+
 import pytest
-from mxdev.config import read_toml, Configuration
-from pathlib import Path
-import os
+
 
 def test_read_toml_basic(tmp_path):
     pyproject = tmp_path / "pyproject.toml"
-    pyproject.write_text("""
+    pyproject.write_text(
+        """
 [tool.mxdev.settings]
 threads = 10
 requirements-in = "reqs.txt"
@@ -16,8 +19,10 @@ def test_read_toml_basic(tmp_path):
 
 [tool.mxdev.hooks.myhook]
 enabled = "true"
-""", encoding="utf-8")
-    
+""",
+        encoding="utf-8",
+    )
+
     wrapper = read_toml(pyproject)
     assert wrapper["settings"]["threads"] == "10"
     assert wrapper["pkg1"]["url"] == "https://example.com/pkg1.git"
@@ -26,55 +31,64 @@ def test_read_toml_basic(tmp_path):
     assert "pkg1" in wrapper.sections()
     assert "myhook" in wrapper.sections()
 
+
 def test_read_toml_no_section(tmp_path):
     pyproject = tmp_path / "pyproject.toml"
     pyproject.write_text("[tool.other]\nkey = 'val'", encoding="utf-8")
-    
+
     wrapper = read_toml(pyproject)
     assert dict(wrapper["settings"].items()) == {}
     assert wrapper.sections() == []
 
+
 def test_configuration_toml(tmp_path):
     pyproject = tmp_path / "pyproject.toml"
-    pyproject.write_text("""
+    pyproject.write_text(
+        """
 [tool.mxdev.settings]
 requirements-in = "requirements-in.txt"
 
 [tool.mxdev.packages.pkg1]
 url = "https://example.com/pkg1.git"
-""", encoding="utf-8")
-    
+""",
+        encoding="utf-8",
+    )
+
     # We need to be in the directory or provide absolute path
     config = Configuration(str(pyproject))
     assert config.infile == "requirements-in.txt"
     assert "pkg1" in config.packages
     assert config.packages["pkg1"]["url"] == "https://example.com/pkg1.git"
 
+
 def test_read_toml_types_to_strings(tmp_path):
     pyproject = tmp_path / "pyproject.toml"
-    pyproject.write_text("""
+    pyproject.write_text(
+        """
 [tool.mxdev.settings]
 threads = 10
 offline = true
 
 [tool.mxdev.packages.pkg1]
 url = "https://example.com/pkg1.git"
 use = false
-""", encoding="utf-8")
-    
+""",
+        encoding="utf-8",
+    )
+
     wrapper = read_toml(pyproject)
     assert wrapper["settings"]["threads"] == "10"
     assert wrapper["settings"]["offline"] == "True"  # TOML bool becomes Python bool then str()
     assert wrapper["pkg1"]["use"] == "False"
 
+
 def test_read_toml_no_parser(monkeypatch):
     import sys
+
     # Mock both tomllib and tomli being missing
-    with patch.dict(sys.modules, {'tomllib': None, 'tomli': None}):
+    with patch.dict(sys.modules, {"tomllib": None, "tomli": None}):
         # We need to reload mxdev.config to apply the mock if it was already imported
         # but read_toml imports them inside the function, so it should work.
         with pytest.raises(ImportError) as excinfo:
             read_toml("any.toml")
         assert "pip install mxdev[toml]" in str(excinfo.value)
-
-from unittest.mock import patch