minimize redundant settings for ruff, restore black-compliant line length

Author: apirogov

pyproject.toml

@@ -126,48 +126,12 @@ exclude_lines = [
 [tool.semantic_release]
 version_variable = "src/somesy/__init__.py:__version__"
 
-[tool.ruff]
-line-length = 120
-indent-width = 4
-exclude = [
-    ".bzr",
-    ".direnv",
-    ".eggs",
-    ".git",
-    ".git-rewrite",
-    ".hg",
-    ".mypy_cache",
-    ".nox",
-    ".pants.d",
-    ".pytype",
-    ".ruff_cache",
-    ".svn",
-    ".tox",
-    ".venv",
-    "__pypackages__",
-    "_build",
-    "buck-out",
-    "build",
-    "dist",
-    "node_modules",
-    "venv",
-]
-
-
 [tool.ruff.lint]
-select = ["E", "F", "I", "D", "B", "S", "W"]
-ignore = ["D203", "D212", "B008"]
+extend-select = ["I", "D", "B", "S", "W"]
+ignore = ["D203", "D213", "B008"]
 
 [tool.ruff.lint.per-file-ignores]
-"__init__.py" = ["E402"]
-"**/{test/*}/*" = ["D", "S"]
-"**/{tests,docs,tools,scripts}/*" = ["ALL"]
-
-[tool.ruff.format]
-quote-style = "double"
-indent-style = "space"
-skip-magic-trailing-comma = false
-line-ending = "auto"
+"**/{tests,docs}/*" = ["ALL"]
 
 [tool.licensecheck]
 using = "poetry"

src/somesy/cff/writer.py

@@ -18,8 +18,7 @@ def __init__(
         path: Path,
         create_if_not_exists: bool = True,
     ):
-        """
-        Citation File Format (CFF) parser.
+        """Citation File Format (CFF) parser.
 
         See [somesy.core.writer.ProjectMetadataWriter.__init__][].
         """
@@ -33,7 +32,9 @@ def __init__(
             "repository": ["repository-code"],
             "maintainers": ["contact"],
         }
-        super().__init__(path, create_if_not_exists=create_if_not_exists, direct_mappings=mappings)
+        super().__init__(
+            path, create_if_not_exists=create_if_not_exists, direct_mappings=mappings
+        )
 
     def _init_new_file(self):
         """Initialize new CFF file."""
@@ -65,7 +66,9 @@ def save(self, path: Optional[Path] = None) -> None:
 
     def _sync_authors(self, metadata: ProjectMetadata) -> None:
         """Ensure that publication authors are added all into author list."""
-        self.authors = self._sync_person_list(self.authors, metadata.publication_authors())
+        self.authors = self._sync_person_list(
+            self.authors, metadata.publication_authors()
+        )
 
     @staticmethod
     def _from_person(person: Person):

src/somesy/cli/init.py

@@ -26,29 +26,39 @@ def config():
     input_file = Path(input_file)
     options = {
         "input_file": input_file,
-        "no_sync_cff": not typer.confirm("Do you want to sync to a CFF file?", default=True),
+        "no_sync_cff": not typer.confirm(
+            "Do you want to sync to a CFF file?", default=True
+        ),
     }
     cff_file = typer.prompt("CFF file path", default="CITATION.cff")
     if cff_file is not None or cff_file != "":
         options["cff_file"] = cff_file
 
-    options["no_sync_pyproject"] = not typer.confirm("Do you want to sync to a pyproject.toml file?", default=True)
+    options["no_sync_pyproject"] = not typer.confirm(
+        "Do you want to sync to a pyproject.toml file?", default=True
+    )
 
     pyproject_file = typer.prompt("pyproject.toml file path", default="pyproject.toml")
     if pyproject_file is not None or pyproject_file != "":
         options["pyproject_file"] = pyproject_file
 
-    options["sync_package_json"] = typer.confirm("Do you want to sync to a package.json file?", default=False)
+    options["sync_package_json"] = typer.confirm(
+        "Do you want to sync to a package.json file?", default=False
+    )
     package_json_file = typer.prompt("package.json file path", default="package.json")
     if package_json_file is not None or package_json_file != "":
         options["package_json_file"] = package_json_file
 
-    options["no_sync_codemeta"] = not typer.confirm("Do you want to sync to a codemeta.json file?", default=True)
+    options["no_sync_codemeta"] = not typer.confirm(
+        "Do you want to sync to a codemeta.json file?", default=True
+    )
     codemeta_file = typer.prompt("codemeta.json file path", default="codemeta.json")
     if codemeta_file is not None or codemeta_file != "":
         options["codemeta_file"] = codemeta_file
 
-    options["show_info"] = typer.confirm("Do you want to show info about the sync process?")
+    options["show_info"] = typer.confirm(
+        "Do you want to show info about the sync process?"
+    )
     options["verbose"] = typer.confirm("Do you want to show verbose logs?")
     options["debug"] = typer.confirm("Do you want to show debug logs?")
 
@@ -63,4 +73,6 @@ def config():
     logger.debug(f"CLI options entered: {options}")
 
     init_config(input_file, options)
-    logger.info(f"[bold green]Input file is updated/created at {input_file}[/bold green]")
+    logger.info(
+        f"[bold green]Input file is updated/created at {input_file}[/bold green]"
+    )

src/somesy/cli/sync.py

@@ -123,13 +123,19 @@ def run_sync(somesy_input: SomesyInput):
     logger.info("[bold green]Synchronizing project metadata...[/bold green]")
     logger.info("Files to sync:")
     if not conf.no_sync_pyproject:
-        logger.info(f"  - [italic]pyproject.toml[/italic]:\t[grey]{conf.pyproject_file}[/grey]")
+        logger.info(
+            f"  - [italic]pyproject.toml[/italic]:\t[grey]{conf.pyproject_file}[/grey]"
+        )
     if not conf.no_sync_package_json:
-        logger.info(f"  - [italic]package.json[/italic]:\t[grey]{conf.package_json_file}[/grey]")
+        logger.info(
+            f"  - [italic]package.json[/italic]:\t[grey]{conf.package_json_file}[/grey]"
+        )
     if not conf.no_sync_cff:
         logger.info(f"  - [italic]CITATION.cff[/italic]:\t[grey]{conf.cff_file}[/grey]")
     if not conf.no_sync_codemeta:
-        logger.info(f"  - [italic]codemeta.json[/italic]:\t[grey]{conf.codemeta_file}[/grey]\n")
+        logger.info(
+            f"  - [italic]codemeta.json[/italic]:\t[grey]{conf.codemeta_file}[/grey]\n"
+        )
     # ----
     sync_command(somesy_input)
     # ----

src/somesy/cli/util.py

@@ -27,8 +27,7 @@ def wrap_exceptions(wrapped, instance, args, kwargs):
 
 
 def resolved_somesy_input(**cli_args) -> SomesyInput:
-    """
-    Return a combined `SomesyInput` based on config file and passed CLI args.
+    """Return a combined `SomesyInput` based on config file and passed CLI args.
 
     Will also adjust log levels accordingly.
     """
@@ -52,5 +51,7 @@ def resolved_somesy_input(**cli_args) -> SomesyInput:
         # no cli log level -> set it according to the loaded configuration
         set_log_level(somesy_input.config.log_level())
 
-    logger.debug(f"Combined config (Defaults + File + CLI):\n{pretty_repr(somesy_input.config)}")
+    logger.debug(
+        f"Combined config (Defaults + File + CLI):\n{pretty_repr(somesy_input.config)}"
+    )
     return somesy_input

src/somesy/codemeta/__init__.py

@@ -11,24 +11,30 @@
 
 
 def collect_cm_sources(conf: SomesyConfig):
-    """
-    Assemble list of inputs for codemetapy based on somesy config.
+    """Assemble list of inputs for codemetapy based on somesy config.
 
     Returns files that are supported by both somesy and codemetapy and are enabled for somesy.
     """
     cm_sources = []
-    if not conf.no_sync_pyproject and conf.pyproject_file is not None and conf.pyproject_file.is_file():
+    if (
+        not conf.no_sync_pyproject
+        and conf.pyproject_file is not None
+        and conf.pyproject_file.is_file()
+    ):
         cm_sources.append(conf.pyproject_file)
     # NOTE: we don't add CFF directly, because it must be handled separately
     # NOTE: add other suitable somesy targets / codemeta sources (except CFF and codemeta) here
-    if conf.no_sync_package_json and conf.package_json_file is not None and conf.package_json_file.is_file():
+    if (
+        conf.no_sync_package_json
+        and conf.package_json_file is not None
+        and conf.package_json_file.is_file()
+    ):
         cm_sources.append(conf.package_json_file)
     return cm_sources
 
 
 def update_codemeta(conf: SomesyConfig):
-    """
-    Generate or update codemeta file based on sources that somesy supports.
+    """Generate or update codemeta file based on sources that somesy supports.
 
     Returns True if file has been written, False if it was up to date.
     """

src/somesy/codemeta/utils.py

@@ -34,8 +34,7 @@
 
 
 def _localize_codemetapy_context(json):
-    """
-    Prevent rdflib external context resolution by embedding it from a file.
+    """Prevent rdflib external context resolution by embedding it from a file.
 
     The context is required to parse the JSON-LD correctly, fields with no
     context are ignored (not considered LD).
@@ -70,8 +69,7 @@ def _graph_from_cm_dict(graph_dict):
 
 
 def _graph_from_cm_file(file: Path) -> rdflib.Graph:
-    """
-    Return loaded codemeta with localized context.
+    """Return loaded codemeta with localized context.
 
     If file does not exist, returns `None` (to distinguish from existing but empty).
     """
@@ -85,8 +83,7 @@ def _graph_from_cm_file(file: Path) -> rdflib.Graph:
 
 
 def update_codemeta_file(cm_file: Path, cm_dict: Dict) -> bool:
-    """
-    Update codemeta file with graph in dict if it changed.
+    """Update codemeta file with graph in dict if it changed.
 
     Returns True if the file update happened.
     """

src/somesy/commands/init_config.py

@@ -11,8 +11,7 @@
 
 
 def init_config(input_path: Path, options: dict) -> None:
-    """
-    Initialize somesy configuration file.
+    """Initialize somesy configuration file.
 
     Args:
     ----

src/somesy/commands/sync.py

@@ -17,7 +17,9 @@ def sync(somesy_input: SomesyInput):
     """Sync selected metadata files with given input file."""
     conf, metadata = somesy_input.config, somesy_input.project
 
-    logger.debug(f"Project metadata: {pretty_repr(metadata.model_dump(exclude_defaults=True))}")
+    logger.debug(
+        f"Project metadata: {pretty_repr(metadata.model_dump(exclude_defaults=True))}"
+    )
 
     # update these only if they exist:
 
@@ -41,8 +43,7 @@ def _sync_python(
     metadata: ProjectMetadata,
     pyproject_file: Path,
 ):
-    """
-    Sync pyproject.toml file using project metadata.
+    """Sync pyproject.toml file using project metadata.
 
     Args:
     ----
@@ -61,8 +62,7 @@ def _sync_cff(
     metadata: ProjectMetadata,
     cff_file: Path,
 ):
-    """
-    Sync CITATION.cff file using project metadata.
+    """Sync CITATION.cff file using project metadata.
 
     Args:
     ----
@@ -81,8 +81,7 @@ def _sync_package_json(
     metadata: ProjectMetadata,
     package_json_file: Path,
 ):
-    """
-    Sync package.json file using project metadata.
+    """Sync package.json file using project metadata.
 
     Args:
     ----

src/somesy/core/core.py

@@ -13,8 +13,7 @@
 
 
 def discover_input(input_file: Optional[Path] = None) -> Path:
-    """
-    Check given input file path. If not given, find somesy configuration file path from default list.
+    """Check given input file path. If not given, find somesy configuration file path from default list.
 
     Args:
     ----
@@ -52,8 +51,7 @@ def discover_input(input_file: Optional[Path] = None) -> Path:
 
 
 def get_input_content(path: Path, *, no_unwrap: bool = False) -> Dict[str, Any]:
-    """
-    Read contents of a supported somesy input file.
+    """Read contents of a supported somesy input file.
 
     Given a path to a TOML file, this function reads the file and returns its content as a TOMLDocument object.
     The function checks if the file is a valid somesy input file by checking its name and content.
@@ -86,7 +84,9 @@ def get_input_content(path: Path, *, no_unwrap: bool = False) -> Dict[str, Any]:
             if "tool" in input_content and "somesy" in input_content["tool"]:
                 return input_content["tool"]["somesy"].unwrap()
             else:
-                raise RuntimeError("No tool.somesy section found in pyproject.toml file!")
+                raise RuntimeError(
+                    "No tool.somesy section found in pyproject.toml file!"
+                )
 
     if path.suffix == ".json" and "package" in path.name:
         with open(path, "r") as f: