Fix Unpin rstcheck

tests/checkers/rstcheck.py

@@ -1,63 +1,49 @@
-"""Sanity test using rstcheck and sphinx."""
+"""Sanity test using rstcheck-core and sphinx."""
 from __future__ import annotations
 
-import re
-import subprocess
+from rstcheck_core.runner import RstcheckMainRunner
+from rstcheck_core.config import RstcheckConfig
+import pathlib
 import sys
 
 
 def main():
-    paths = sys.argv[1:] or sys.stdin.read().splitlines()
-
-    encoding = 'utf-8'
-
-    ignore_substitutions = (
-        'br',
+    # Read input paths from CLI arguments or stdin
+    if sys.argv[1:]:
+        raw_paths = sys.argv[1:]
+    else:
+        raw_paths = sys.stdin.read().splitlines()
+
+    # Convert to pathlib.Path objects
+    paths = [pathlib.Path(p) for p in raw_paths]
+
+    # Handle case where no paths are provided
+    if not paths:
+        print("No files or directories provided for checking.", file=sys.stderr)
+        sys.exit(1)
+
+    # Define the configuration for rstcheck
+    config = RstcheckConfig(
+        ignore_roles=[
+            "ansplugin", "ansopt", "ansretval", "ansval", "ansenvvar", "ansenvvarref"
+        ],
+        ignore_substitutions=["br"],
+        report_level="warning",  # Adjust report level as needed: "info", "warning", "error", "severe", "none"
+        recursive=True,          # Set to True to check directories recursively
     )
 
-    cmd = [
-        sys.executable,
-        '-c', 'import rstcheck; rstcheck.main();',
-        '--report', 'warning',
-        '--ignore-roles', 'ansplugin,ansopt,ansretval,ansval,ansenvvar,ansenvvarref',
-        '--ignore-substitutions', ','.join(ignore_substitutions),
-    ] + paths
-
-    process = subprocess.run(cmd,
-                             stdin=subprocess.DEVNULL,
-                             stdout=subprocess.PIPE,
-                             stderr=subprocess.PIPE,
-                             check=False,
-                             )
-
-    if process.stdout:
-        raise Exception(process.stdout)
-
-    pattern = re.compile(r'^(?P<path>[^:]*):(?P<line>[0-9]+): \((?P<level>INFO|WARNING|ERROR|SEVERE)/[0-4]\) (?P<message>.*)$')
-
-    results = parse_to_list_of_dict(pattern, process.stderr.decode(encoding))
-
-    for result in results:
-        print('%s:%s:%s: %s' % (result['path'], result['line'], 0, result['message']))
-
-
-def parse_to_list_of_dict(pattern, value):
-    matched = []
-    unmatched = []
-
-    for line in value.splitlines():
-        match = re.search(pattern, line)
-
-        if match:
-            matched.append(match.groupdict())
-        else:
-            unmatched.append(line)
-
-    if unmatched:
-        raise Exception('Pattern "%s" did not match values:\n%s' % (pattern, '\n'.join(unmatched)))
-
-    return matched
-
+    # Initialize the runner
+    runner = RstcheckMainRunner(
+        check_paths=paths,
+        rstcheck_config=config,
+        overwrite_config=True,
+    )
+
+    # Run the checks
+    exit_code = runner.run()
+
+    # Exit with the appropriate code
+    sys.exit(exit_code)
 
 if __name__ == '__main__':
     main()

tests/requirements.in

@@ -11,6 +11,7 @@ sphinx-notfound-page # extension used for the custom 404 page (cowsay)
 sphinx-ansible-theme # extension used for the custom docs theme
 sphinx-rtd-theme
 rstcheck
+rstcheck-core
 sphinx-copybutton
 jinja2 # used by hacking/build_library/build_ansible/command_plugins/generate_man.py and dump_keywords.py
 pyyaml # used by ansible-core

tests/requirements.txt

@@ -68,6 +68,7 @@ docutils==0.18.1
     #   antsibull-docs
     #   antsibull-docutils
     #   rstcheck
+    #   rstcheck-core
     #   sphinx
     #   sphinx-rtd-theme
 frozenlist==1.5.0
@@ -112,6 +113,7 @@ pydantic==2.10.5
     # via
     #   antsibull-core
     #   antsibull-docs
+    #   rstcheck-core
 pydantic-core==2.27.2
     # via pydantic
 pygments==2.19.1
@@ -138,6 +140,8 @@ rstcheck==5.0.0
     #   -r tests/requirements.in
     #   antsibull-changelog
     #   antsibull-docs
+rstcheck-core==1.2.1
+    # via -r tests/requirements.in
 semantic-version==2.10.0
     # via
     #   antsibull-changelog