FIx.

Author: tobiasraabe

.pre-commit-config.yaml

@@ -3,8 +3,7 @@ repos:
     rev: v4.6.0
     hooks:
     -   id: check-added-large-files
-        args:
-        - --maxkb=25
+        args: [--maxkb=25]
     -   id: check-case-conflict
     -   id: check-merge-conflict
     -   id: check-vcs-permalinks
@@ -14,9 +13,7 @@ repos:
     -   id: fix-byte-order-marker
     -   id: mixed-line-ending
     -   id: no-commit-to-branch
-        args:
-        - --branch
-        - main
+        args: [--branch, main]
     -   id: trailing-whitespace
 -   repo: https://github.com/pre-commit/pygrep-hooks
     rev: v1.10.0
@@ -27,89 +24,33 @@ repos:
     -   id: python-no-log-warn
     -   id: python-use-type-annotations
     -   id: text-unicode-replacement-char
--   repo: https://github.com/asottile/reorder-python-imports
-    rev: v3.12.0
-    hooks:
-    -   id: reorder-python-imports
-        args:
-        - --py38-plus
-        - --add-import
-        - from __future__ import annotations
 -   repo: https://github.com/asottile/setup-cfg-fmt
     rev: v2.5.0
     hooks:
     -   id: setup-cfg-fmt
--   repo: https://github.com/PyCQA/docformatter
-    rev: v1.7.5
-    hooks:
-    -   id: docformatter
-        args:
-        - --in-place
-        - --wrap-summaries
-        - '88'
-        - --wrap-descriptions
-        - '88'
-        - --blank
--   repo: https://github.com/psf/black
-    rev: 24.4.2
-    hooks:
-    -   id: black
 -   repo: https://github.com/astral-sh/ruff-pre-commit
     rev: v0.4.4
     hooks:
     -   id: ruff
+    -   id: ruff-format
 -   repo: https://github.com/dosisod/refurb
     rev: v2.0.0
     hooks:
     -   id: refurb
-        args:
-        - --ignore
-        - FURB126
--   repo: https://github.com/econchick/interrogate
-    rev: 1.7.0
-    hooks:
-    -   id: interrogate
-        args:
-        - -v
-        - --fail-under=40
-        - src
-        - tests
 -   repo: https://github.com/executablebooks/mdformat
     rev: 0.7.17
     hooks:
     -   id: mdformat
         additional_dependencies:
         - mdformat-gfm
         - mdformat-black
-        args:
-        - --wrap
-        - '88'
+        args: [--wrap, "88"]
 -   repo: https://github.com/codespell-project/codespell
     rev: v2.2.6
     hooks:
     -   id: codespell
--   repo: https://github.com/pre-commit/mirrors-mypy
-    rev: v1.10.0
-    hooks:
-    -   id: mypy
-        args:
-        - --no-strict-optional
-        - --ignore-missing-imports
-        additional_dependencies:
-        - attrs
-        - click
-        - types-setuptools
-        pass_filenames: false
--   repo: https://github.com/mgedmin/check-manifest
-    rev: '0.49'
-    hooks:
-    -   id: check-manifest
-        args:
-        - --no-build-isolation
-        additional_dependencies:
-        - setuptools-scm
-        - toml
 -   repo: meta
     hooks:
     -   id: check-hooks-apply
     -   id: check-useless-excludes
+    # -   id: identity  # Prints all files passed to pre-commits. Debugging.

pyproject.toml

@@ -2,11 +2,9 @@
 requires = ["setuptools>=45", "wheel", "setuptools_scm[toml]>=6.0"]
 build-backend = "setuptools.build_meta"
 
-
 [tool.setuptools_scm]
 write_to = "src/pytask_stata/_version.py"
 
-
 [tool.mypy]
 files = ["src", "tests"]
 check_untyped_defs = true
@@ -17,54 +15,36 @@ no_implicit_optional = true
 warn_redundant_casts = true
 warn_unused_ignores = true
 
-
 [[tool.mypy.overrides]]
 module = "tests.*"
 disallow_untyped_defs = false
 ignore_errors = true
 
-
 [tool.ruff]
 target-version = "py38"
-select = ["ALL"]
 fix = true
-extend-ignore = [
-    "I",  # ignore isort
-    "TRY",
-    # Numpy docstyle
-    "D107",
-    "D203",
-    "D212",
-    "D213",
-    "D402",
-    "D413",
-    "D415",
-    "D416",
-    "D417",
-    # Others.
-    "D404",  # Do not start module docstring with "This".
-    "RET504",  # unnecessary variable assignment before return.
-    "S101",  # raise errors for asserts.
-    "B905",  # strict parameter for zip that was implemented in py310.
-    "ANN101",  # type annotating self
-    "ANN102",  # type annotating cls
-    "FBT",  # flake8-boolean-trap
-    "EM",  # flake8-errmsg
-    "ANN401",  # flake8-annotate typing.Any
-    "PD",  # pandas-vet
-    "COM812",  # trailing comma missing, but black takes care of that
-]
+unsafe-fixes = true
 
+[tool.ruff.lint]
+select = ["ALL"]
+ignore = [
+    "ANN101",
+    "ANN102",
+    "ANN401", # flake8-annotate typing.Any
+    "COM812", # Comply with ruff-format.
+    "ISC001", # Comply with ruff-format.
+]
 
-[tool.ruff.per-file-ignores]
-"tests/*" = ["D", "ANN"]
+[tool.ruff.lint.per-file-ignores]
+"tests/*" = ["D", "ANN", "S101"]
 "__init__.py" = ["D104"]
 
+[tool.ruff.lint.isort]
+force-single-line = true
 
-[tool.ruff.pydocstyle]
+[tool.ruff.lint.pydocstyle]
 convention = "numpy"
 
-
 [tool.pytest.ini_options]
 # Do not add src since it messes with the loading of pytask-parallel as a plugin.
 testpaths = ["tests"]

src/pytask_stata/collect.py

@@ -5,18 +5,19 @@
 import functools
 import subprocess
 from types import FunctionType
-from typing import Any
 from typing import TYPE_CHECKING
+from typing import Any
 
+from pytask import Mark
+from pytask import Session
+from pytask import Task
 from pytask import depends_on
 from pytask import has_mark
 from pytask import hookimpl
-from pytask import Mark
 from pytask import parse_nodes
 from pytask import produces
 from pytask import remove_marks
-from pytask import Session
-from pytask import Task
+
 from pytask_stata.shared import convert_task_id_to_name_of_log_file
 from pytask_stata.shared import stata
 
@@ -48,10 +49,11 @@ def pytask_collect_task(
         obj, marks = remove_marks(obj, "stata")
 
         if len(marks) > 1:
-            raise ValueError(
+            msg = (
                 f"Task {name!r} has multiple @pytask.mark.stata marks, but only one is "
                 "allowed."
             )
+            raise ValueError(msg)
 
         mark = _parse_stata_mark(mark=marks[0])
         script, options = stata(**marks[0].kwargs)
@@ -110,8 +112,7 @@ def _parse_stata_mark(mark: Mark) -> Mark:
 
     parsed_kwargs = {"script": script or None, "options": options or []}
 
-    mark = Mark("stata", (), parsed_kwargs)
-    return mark
+    return Mark("stata", (), parsed_kwargs)
 
 
 def _copy_func(func: FunctionType) -> FunctionType:

src/pytask_stata/config.py

@@ -7,6 +7,7 @@
 from typing import Any
 
 from pytask import hookimpl
+
 from pytask_stata.shared import STATA_COMMANDS
 
 

src/pytask_stata/execute.py

@@ -4,24 +4,26 @@
 
 import re
 
-from pytask import has_mark
-from pytask import hookimpl
 from pytask import Session
 from pytask import Task
-from pytask_stata.shared import convert_task_id_to_name_of_log_file
+from pytask import has_mark
+from pytask import hookimpl
+
 from pytask_stata.shared import STATA_COMMANDS
+from pytask_stata.shared import convert_task_id_to_name_of_log_file
 
 
 @hookimpl
 def pytask_execute_task_setup(session: Session, task: Task) -> None:
     """Check if Stata is found on the PATH."""
     if has_mark(task, "stata") and session.config["stata"] is None:
-        raise RuntimeError(
+        msg = (
             "Stata is needed to run do-files, but it is not found on your PATH.\n\n"
             f"We are looking for one of {STATA_COMMANDS} on your PATH. If you have a"
             "different Stata executable, please, file an issue at "
             "https://github.com/pytask-dev/pytask-stata."
         )
+        raise RuntimeError(msg)
 
 
 @hookimpl

src/pytask_stata/plugin.py

@@ -5,6 +5,7 @@
 from typing import TYPE_CHECKING
 
 from _pytask.config import hookimpl
+
 from pytask_stata import cli
 from pytask_stata import collect
 from pytask_stata import config

src/pytask_stata/shared.py

@@ -3,10 +3,10 @@
 from __future__ import annotations
 
 import sys
+from typing import TYPE_CHECKING
 from typing import Any
 from typing import Iterable
 from typing import Sequence
-from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:
     from pathlib import Path
@@ -79,9 +79,7 @@ def convert_task_id_to_name_of_log_file(id_: str) -> str:
     'task_example_py_task_example[arg1]'
 
     """
-    id_without_parent_directories = id_.rsplit("/")[-1]
-    converted_id = id_without_parent_directories.replace(".", "_").replace("::", "_")
-    return converted_id
+    return id_.rsplit("/")[-1].replace(".", "_").replace("::", "_")
 
 
 def _to_list(scalar_or_iter: Any) -> list[Any]:

tests/conftest.py

@@ -6,7 +6,6 @@
 from click.testing import CliRunner
 from pytask_stata.config import STATA_COMMANDS
 
-
 needs_stata = pytest.mark.skipif(
     next(
         (executable for executable in STATA_COMMANDS if shutil.which(executable)), None

tests/test_execute.py

@@ -6,12 +6,12 @@
 from pathlib import Path
 
 import pytest
-from pytask import cli
 from pytask import ExitCode
-from pytask import main
 from pytask import Mark
 from pytask import Session
 from pytask import Task
+from pytask import cli
+from pytask import main
 from pytask_stata.config import STATA_COMMANDS
 from pytask_stata.execute import pytask_execute_task_setup
 
@@ -117,7 +117,8 @@ def task_run_do_file():
 
     # Hide Stata if available.
     monkeypatch.setattr(
-        "pytask_stata.config.shutil.which", lambda x: None  # noqa: ARG005
+        "pytask_stata.config.shutil.which",
+        lambda x: None,  # noqa: ARG005
     )
 
     session = main({"paths": tmp_path})

tests/test_parallel.py

@@ -6,8 +6,8 @@
 import time
 
 import pytest
-from pytask import cli
 from pytask import ExitCode
+from pytask import cli
 
 from tests.conftest import needs_stata
 

tests/test_parametrize.py

@@ -4,8 +4,8 @@
 import textwrap
 
 import pytest
-from pytask import cli
 from pytask import ExitCode
+from pytask import cli
 
 from tests.conftest import needs_stata