More pathlib adoption

pyproject.toml

@@ -236,7 +236,6 @@ ignore = [
   "D102", # Missing docstring in public method (currently in too many places)
   "FBT",
   "PLR",
-  "PTH",
   "TRY",
 ]
 select = ["ALL"]
@@ -257,6 +256,11 @@ known-first-party = ["ansiblelint"]
 "test/**/*.py" = ["S"]
 "src/ansiblelint/rules/*.py" = ["S"]
 "src/ansiblelint/testing/*.py" = ["S"]
+# Temporary disabled until we fix them:
+"src/ansiblelint/{testing,schemas,rules}/*.py" = ["PTH"]
+"src/ansiblelint/{utils,file_utils,runner,loaders,constants,config,cli,_mockings,__main__}.py" = [
+  "PTH",
+]
 
 [tool.setuptools.dynamic]
 optional-dependencies.docs = { file = [".config/requirements-docs.txt"] }

src/ansiblelint/__main__.py

@@ -31,6 +31,7 @@
 import subprocess
 import sys
 from contextlib import contextmanager
+from pathlib import Path
 from typing import TYPE_CHECKING, Any, Callable, TextIO
 
 from ansible_compat.config import ansible_version
@@ -226,11 +227,11 @@ def main(argv: list[str] | None = None) -> int:  # noqa: C901
     for level, message in log_entries:
         _logger.log(level, message)
     _logger.debug("Options: %s", options)
-    _logger.debug(os.getcwd())
+    _logger.debug("CWD: %s", Path.cwd())
 
     if not options.offline:
         # pylint: disable=import-outside-toplevel
-        from ansiblelint.schemas import refresh_schemas
+        from ansiblelint.schemas.__main__ import refresh_schemas
 
         refresh_schemas()
 

src/ansiblelint/_mockings.py

@@ -3,31 +3,46 @@
 
 import contextlib
 import logging
-import os
 import re
 import sys
+from typing import TYPE_CHECKING
 
 from ansiblelint.config import options
 from ansiblelint.constants import ANSIBLE_MOCKED_MODULE, RC
 
+if TYPE_CHECKING:
+    from pathlib import Path
+
 _logger = logging.getLogger(__name__)
 
 
 def _make_module_stub(module_name: str) -> None:
+    if not options.cache_dir:
+        msg = "Cache directory not set"
+        raise RuntimeError(msg)
     # a.b.c is treated a collection
     if re.match(r"^(\w+|\w+\.\w+\.[\.\w]+)$", module_name):
         parts = module_name.split(".")
         if len(parts) < 3:
-            path = f"{options.cache_dir}/modules"
+            path = options.cache_dir / "modules"
             module_file = f"{options.cache_dir}/modules/{module_name}.py"
             namespace = None
             collection = None
         else:
             namespace = parts[0]
             collection = parts[1]
-            path = f"{ options.cache_dir }/collections/ansible_collections/{ namespace }/{ collection }/plugins/modules/{ '/'.join(parts[2:-1]) }"
+            path = (
+                options.cache_dir
+                / "collections"
+                / "ansible_collections"
+                / namespace
+                / collection
+                / "plugins"
+                / "modules"
+                / ("/".join(parts[2:-1]))
+            )
             module_file = f"{path}/{parts[-1]}.py"
-        os.makedirs(path, exist_ok=True)
+        path.mkdir(exist_ok=True, parents=True)
         _write_module_stub(
             filename=module_file,
             name=module_file,
@@ -58,17 +73,29 @@ def _write_module_stub(
 # pylint: disable=too-many-branches
 def _perform_mockings() -> None:
     """Mock modules and roles."""
+    path: Path
+    if not options.cache_dir:
+        msg = "Cache directory not set"
+        raise RuntimeError(msg)
     for role_name in options.mock_roles:
         if re.match(r"\w+\.\w+\.\w+$", role_name):
             namespace, collection, role_dir = role_name.split(".")
-            path = f"{options.cache_dir}/collections/ansible_collections/{ namespace }/{ collection }/roles/{ role_dir }/"
+            path = (
+                options.cache_dir
+                / "collections"
+                / "ansible_collections"
+                / namespace
+                / collection
+                / "roles"
+                / role_dir
+            )
         else:
-            path = f"{options.cache_dir}/roles/{role_name}"
+            path = options.cache_dir / "roles" / role_name
         # Avoid error from makedirs if destination is a broken symlink
-        if os.path.islink(path) and not os.path.exists(path):  # pragma: no cover
+        if path.is_symlink() and not path.exists():  # pragma: no cover
             _logger.warning("Removed broken symlink from %s", path)
-            os.unlink(path)
-        os.makedirs(path, exist_ok=True)
+            path.unlink(missing_ok=True)
+        path.mkdir(exist_ok=True, parents=True)
 
     if options.mock_modules:
         for module_name in options.mock_modules:
@@ -77,11 +104,22 @@ def _perform_mockings() -> None:
 
 def _perform_mockings_cleanup() -> None:
     """Clean up mocked modules and roles."""
+    if not options.cache_dir:
+        msg = "Cache directory not set"
+        raise RuntimeError(msg)
     for role_name in options.mock_roles:
         if re.match(r"\w+\.\w+\.\w+$", role_name):
             namespace, collection, role_dir = role_name.split(".")
-            path = f"{options.cache_dir}/collections/ansible_collections/{ namespace }/{ collection }/roles/{ role_dir }/"
+            path = (
+                options.cache_dir
+                / "collections"
+                / "ansible_collections"
+                / namespace
+                / collection
+                / "roles"
+                / role_dir
+            )
         else:
-            path = f"{options.cache_dir}/roles/{role_name}"
+            path = options.cache_dir / "roles" / role_name
         with contextlib.suppress(OSError):
-            os.rmdir(path)
+            path.unlink()

src/ansiblelint/_vendor/__init__.py

@@ -1,7 +1,7 @@
-import os
 import pkgutil
 import sys
 import warnings
+from pathlib import Path
 
 # This package exists to host vendored top-level Python packages for downstream packaging. Any Python packages
 # installed beneath this one will be masked from the Ansible loader, and available from the front of sys.path.
@@ -18,7 +18,7 @@
 def _ensure_vendored_path_entry() -> None:
     """Ensure that any downstream-bundled content beneath this package is available at the top of sys.path."""
     # patch our vendored dir onto sys.path
-    vendored_path_entry = os.path.dirname(__file__)
+    vendored_path_entry = str(Path(__file__).parent)
     vendored_module_names = {
         m[1] for m in pkgutil.iter_modules([vendored_path_entry], "")
     }  # m[1] == m.name

src/ansiblelint/app.py

@@ -5,6 +5,7 @@
 import logging
 import os
 from functools import lru_cache
+from pathlib import Path
 from typing import TYPE_CHECKING, Any
 
 from ansible_compat.runtime import Runtime
@@ -101,7 +102,7 @@ def render_matches(self, matches: list[MatchError]) -> None:  # noqa: C901
         if self.options.sarif_file:
             sarif = formatters.SarifFormatter(self.options.cwd, True)
             json = sarif.format_result(matches)
-            with open(self.options.sarif_file, "w", encoding="utf-8") as sarif_file:
+            with self.options.sarif_file.open("w", encoding="utf-8") as sarif_file:
                 sarif_file.write(json)
 
     def count_results(self, matches: list[MatchError]) -> SummarizedResults:
@@ -177,11 +178,12 @@ def report_outcome(self, result: LintResult, mark_as_success: bool = False) -> i
         matched_rules = self._get_matched_skippable_rules(result.matches)
 
         if matched_rules and self.options.generate_ignore:
-            console_stderr.print(f"Writing ignore file to {IGNORE_FILE.default}")
+            ignore_file_path = Path(IGNORE_FILE.default)
+            console_stderr.print(f"Writing ignore file to {ignore_file_path}")
             lines = set()
             for rule in result.matches:
                 lines.add(f"{rule.filename} {rule.tag}\n")
-            with open(IGNORE_FILE.default, "w", encoding="utf-8") as ignore_file:
+            with ignore_file_path.open("w", encoding="utf-8") as ignore_file:
                 ignore_file.write(
                     "# This file contains ignores rule violations for ansible-lint\n",
                 )

src/ansiblelint/cli.py

@@ -272,7 +272,12 @@ def get_cli_parser() -> argparse.ArgumentParser:
         ],
         help="stdout formatting, json being an alias for codeclimate. (default: %(default)s)",
     )
-    parser.add_argument("--sarif-file", default=None, help="SARIF output file")
+    parser.add_argument(
+        "--sarif-file",
+        default=None,
+        type=Path,
+        help="SARIF output file",
+    )
     parser.add_argument(
         "-q",
         dest="quiet",

src/ansiblelint/constants.py

@@ -1,6 +1,7 @@
 """Constants used by AnsibleLint."""
 import os.path
 from enum import Enum
+from pathlib import Path
 from typing import Literal
 
 DEFAULT_RULESDIR = os.path.join(os.path.dirname(__file__), "rules")
@@ -162,7 +163,7 @@ def main():
 # reusable actions, where the mounted volume might have different owner.
 #
 # https://github.com/ansible/ansible-lint-action/issues/138
-GIT_CMD = ["git", "-c", f"safe.directory={os.getcwd()}"]
+GIT_CMD = ["git", "-c", f"safe.directory={Path.cwd()}"]
 
 CONFIG_FILENAMES = [".ansible-lint", ".config/ansible-lint.yml"]
 

src/ansiblelint/rules/__init__.py

@@ -369,7 +369,7 @@ class RulesCollection:
 
     def __init__(
         self,
-        rulesdirs: list[str] | None = None,
+        rulesdirs: list[str] | list[Path] | None = None,
         options: Options = default_options,
         profile_name: str | None = None,
         conditional: bool = True,
@@ -379,9 +379,8 @@ def __init__(
         self.profile = []
         if profile_name:
             self.profile = PROFILES[profile_name]
-        if rulesdirs is None:
-            rulesdirs = []
-        self.rulesdirs = expand_paths_vars(rulesdirs)
+        rulesdirs_str = [] if rulesdirs is None else [str(r) for r in rulesdirs]
+        self.rulesdirs = expand_paths_vars(rulesdirs_str)
         self.rules: list[BaseRule] = []
         # internal rules included in order to expose them for docs as they are
         # not directly loaded by our rule loader.
@@ -393,7 +392,7 @@ def __init__(
                 WarningRule(),
             ],
         )
-        for rule in load_plugins(rulesdirs):
+        for rule in load_plugins(rulesdirs_str):
             self.register(rule, conditional=conditional)
         self.rules = sorted(self.rules)
 

src/ansiblelint/runner.py

@@ -19,6 +19,7 @@
 
 if TYPE_CHECKING:
     from collections.abc import Generator
+    from pathlib import Path
 
     from ansiblelint.config import Options
     from ansiblelint.rules import RulesCollection
@@ -40,7 +41,7 @@ class Runner:
     # pylint: disable=too-many-arguments,too-many-instance-attributes
     def __init__(
         self,
-        *lintables: Lintable | str,
+        *lintables: Lintable | str | Path,
         rules: RulesCollection,
         tags: frozenset[Any] = frozenset(),
         skip_list: list[str] | None = None,

src/ansiblelint/schemas/__init__.py

@@ -1,5 +1 @@
 """Module containing cached JSON schemas."""
-from ansiblelint.schemas.__main__ import refresh_schemas
-from ansiblelint.schemas.main import validate_file_schema
-
-__all__ = ("refresh_schemas", "validate_file_schema")

src/ansiblelint/schemas/__store__.json

@@ -1,14 +1,14 @@
 {
   "ansible-lint-config": {
-    "etag": "ae3bdb0eed9825f89ad76dc5dc4d812ca08591558bbdde401ba68030d658c6f6",
+    "etag": "0c180fc60da7bfbbf70d0ffa6dd4871aefce5e6f987f9c8073cb203dacd991b2",
     "url": "https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/ansible-lint-config.json"
   },
   "ansible-navigator-config": {
-    "etag": "22dcf91587ac30f126a20907a9a036e56860bbe36dc6b18fc15a7fbad0312c73",
+    "etag": "59cfdb89d07c929dbd8a0127fbc824faffdb0a094052d36935266770fcbd4bca",
     "url": "https://raw.githubusercontent.com/ansible/ansible-navigator/main/src/ansible_navigator/data/ansible-navigator.json"
   },
   "changelog": {
-    "etag": "9d65bd02c484c8fdfb98527401b49ff74d05edc8092abfb2767a2d06a7eb2063",
+    "etag": "593ed5eef7c1e670f3667de70d43a41a5138513bd9640a85cbe8cb6faaa59793",
     "url": "https://raw.githubusercontent.com/ansible/ansible-lint/main/src/ansiblelint/schemas/changelog.json"
   },
   "execution-environment": {

src/ansiblelint/schemas/ansible-navigator-config.json

@@ -520,7 +520,7 @@
     "required": [
         "ansible-navigator"
     ],
-    "title": "ansible-navigator settings v3.1",
+    "title": "ansible-navigator settings v3.2",
     "type": "object",
-    "version": "3.1"
+    "version": "3.2"
 }

src/ansiblelint/testing/__init__.py

@@ -97,14 +97,14 @@ def run_role_defaults_main(self, defaults_main_text: str) -> list[MatchError]:
 
 
 def run_ansible_lint(
-    *argv: str,
+    *argv: str | Path,
     cwd: Path | None = None,
     executable: str | None = None,
     env: dict[str, str] | None = None,
     offline: bool = True,
 ) -> CompletedProcess:
     """Run ansible-lint on a given path and returns its output."""
-    args = [*argv]
+    args = [str(item) for item in argv]
     if offline:  # pragma: no cover
         args.insert(0, "--offline")
 

src/ansiblelint/yaml_utils.py

@@ -8,6 +8,7 @@
 import re
 from collections.abc import Iterator, Sequence
 from io import StringIO
+from pathlib import Path
 from re import Pattern
 from typing import TYPE_CHECKING, Any, Callable, Union, cast
 
@@ -85,21 +86,21 @@ def load_yamllint_config() -> YamlLintConfig:
     config = YamlLintConfig(content=YAMLLINT_CONFIG)
     # if we detect local yamllint config we use it but raise a warning
     # as this is likely to get out of sync with our internal config.
-    for file in [
+    for path in [
         ".yamllint",
         ".yamllint.yaml",
         ".yamllint.yml",
         os.getenv("YAMLLINT_CONFIG_FILE", ""),
-        os.getenv("XDG_CONFIG_HOME", os.path.expanduser("~/.config"))
-        + "/yamllint/config",
+        os.getenv("XDG_CONFIG_HOME", "~/.config") + "/yamllint/config",
     ]:
-        if os.path.isfile(file):
+        file = Path(path).expanduser()
+        if file.is_file():
             _logger.debug(
                 "Loading custom %s config file, this extends our "
                 "internal yamllint config.",
                 file,
             )
-            config_override = YamlLintConfig(file=file)
+            config_override = YamlLintConfig(file=str(file))
             config_override.extend(config)
             config = config_override
             break