Typing fixes

Author: Christian Knittl-Frank

src/sphinxcontrib/scm/directives.py

@@ -5,15 +5,16 @@
 from docutils import nodes
 from docutils.nodes import Node
 from docutils.statemachine import StringList
-from sphinx.util import logging, nested_parse_with_titles
+from sphinx.util import logging
 from sphinx.util.docutils import SphinxDirective
+from sphinx.util.nodes import nested_parse_with_titles
 
 from .util import Helper
 
 logger = logging.getLogger(f"sphinxcontrib-scm.{__name__}")
 
 
-class ContribsDirective(SphinxDirective, Helper):
+class ContribsDirective(Helper, SphinxDirective):
     has_content = False
     optional_arguments = 0
     option_spec = {
@@ -24,7 +25,7 @@ class ContribsDirective(SphinxDirective, Helper):
         "type": str,
     }
 
-    def run(self) -> Node:
+    def run(self) -> list[Node]:
         """Directive to list all SCM contributors"""
         contributors = self.get_contibutors()
         contributors_str = (

src/sphinxcontrib/scm/roles.py

@@ -12,7 +12,7 @@
 logger = logging.getLogger(f"sphinxcontrib-scm.{__name__}")
 
 
-class ContribsRole(SphinxRole, Helper):
+class ContribsRole(Helper, SphinxRole):
     def run(self) -> tuple[list[Node], list[system_message]]:
         """Role to list all SCM contributors"""
         contributors = self.get_contibutors()

src/sphinxcontrib/scm/util.py

@@ -5,12 +5,22 @@
 
 from docutils.parsers.rst import directives
 from git.cmd import Git
+from sphinx.config import Config
 from sphinx.util import logging
 
 logger = logging.getLogger(f"sphinxcontrib-scm.{__name__}")
 
 
 class Helper:
+    options: dict
+
+    def get_source_info(self, lineno: int | None = None) -> tuple[str, int]:
+        raise NotImplementedError
+
+    @property
+    def config(self) -> Config:
+        raise NotImplementedError
+
     def get_contibutors(self) -> list[str]:
         """Return list of Git contributors for given path using `git shortlog`