Merge branch 'mh-bump-sphinx-py' into mh-schema-validation

Author: ubmarco

.github/workflows/ci.yaml

@@ -23,18 +23,25 @@ jobs:
       fail-fast: false # Set on "false" to get the results of ALL builds
       matrix:
         os: ["ubuntu-latest"]
-        python-version: ["3.10", "3.12"]
-        sphinx-version: ["7.0", "8.0"]
+        python-version: ["3.9", "3.12", "3.13"]
+        sphinx-version: ["7.4", "8.2"]
         include:
-          - os: "ubuntu-latest"
-            python-version: "3.9"
-            sphinx-version: "7.0"
+          # corner cases for Windows
           - os: "windows-latest"
             python-version: "3.9"
-            sphinx-version: "7.0"
+            sphinx-version: "7.4"
           - os: "windows-latest"
             python-version: "3.12"
-            sphinx-version: "8.0"
+            sphinx-version: "8.2"
+          - os: "windows-latest"
+            python-version: "3.13"
+            sphinx-version: "8.2"
+        exclude:
+          # Sphinx 8.2 only supports py3.11+
+          - os: "ubuntu-latest"
+            python-version: "3.9"
+            sphinx-version: "8.2"
+
     steps:
       - uses: actions/checkout@v4
       - name: Install graphviz (linux)
@@ -75,10 +82,10 @@ jobs:
         include:
           - os: "ubuntu-latest"
             python-version: "3.9"
-            sphinx-version: "7.0"
+            sphinx-version: "7.4"
           - os: "ubuntu-latest"
-            python-version: "3.12"
-            sphinx-version: "8.0"
+            python-version: "3.13"
+            sphinx-version: "8.2"
     steps:
       - uses: actions/checkout@v4
       - name: Use Node.js

docs/directives/needimport.rst

@@ -26,26 +26,34 @@ The directive argument can be one of the following formats:
 - A remote URL from which to download the ``needs.json``:
 
   .. code-block:: rst
-   
+
      .. needimport:: https://my_company.com/docs/remote-needs.json
 
 - A local path relative to the containing document:
 
   .. code-block:: rst
-   
+
      .. needimport:: needs.json
 
 - A local path starting with ``/`` is relative to the Sphinx source directory:
 
   .. code-block:: rst
-   
+
      .. needimport:: /path/to/needs.json
 
-- For an absolute path, make sure to start with two ``//`` (on Linux/OSX):
+- For an absolute path on Linux/OSX, make sure to start with two ``//``:
 
   .. code-block:: rst
-   
-     .. needimport:: //absoulte/path/to/needs.json
+
+     .. needimport:: //absolute/path/to/needs.json
+
+- For an absolute path on Windows, just use the normal drive letters with either forward or backward slashes:
+
+  .. code-block:: rst
+
+     .. needimport:: c:/absolute/path/to/needs.json
+
+     .. needimport:: c:\absolute\path\to\needs.json
 
 Options
 -------

pyproject.toml

@@ -21,13 +21,14 @@ classifiers = [
   'Programming Language :: Python :: 3.10',
   'Programming Language :: Python :: 3.11',
   'Programming Language :: Python :: 3.12',
+  'Programming Language :: Python :: 3.13',
   'Topic :: Documentation',
   'Topic :: Utilities',
   'Framework :: Sphinx :: Extension',
 ]
 requires-python = ">=3.9,<4"
 dependencies = [
-  "sphinx>=7.0,<9",
+  "sphinx>=7.4,<9",
   "requests-file~=2.1",             # external links
   "requests~=2.32",                 # external links
   "jsonschema>=3.2.0",              # needsimport schema validation

sphinx_needs/directives/needimport.py

@@ -90,34 +90,9 @@ def run(self) -> Sequence[nodes.Node]:
         else:
             logger.info(f"Importing needs from {need_import_path}")
 
-            if not os.path.isabs(need_import_path):
-                # Relative path should start from current rst file directory
-                curr_dir = os.path.dirname(self.docname)
-                new_need_import_path = os.path.join(
-                    self.env.app.srcdir, curr_dir, need_import_path
-                )
-
-                correct_need_import_path = new_need_import_path
-                if not os.path.exists(new_need_import_path):
-                    # Check the old way that calculates relative path starting from conf.py directory
-                    old_need_import_path = os.path.join(
-                        self.env.app.srcdir, need_import_path
-                    )
-                    if os.path.exists(old_need_import_path):
-                        correct_need_import_path = old_need_import_path
-                        log_warning(
-                            logger,
-                            "Deprecation warning: Relative path must be relative to the current document in future, "
-                            "not to the conf.py location. Use a starting '/', like '/needs.json', to make the path "
-                            "relative to conf.py.",
-                            "deprecated",
-                            location=(self.env.docname, self.lineno),
-                        )
-            else:
-                # Absolute path starts with /, based on the source directory. The / need to be striped
-                correct_need_import_path = os.path.join(
-                    self.env.app.srcdir, need_import_path[1:]
-                )
+            correct_need_import_path = self.env.relfn2path(
+                need_import_path, self.env.docname
+            )[1]
 
             if not os.path.exists(correct_need_import_path):
                 raise ReferenceError(

sphinx_needs/directives/needuml.py

@@ -4,6 +4,7 @@
 import os
 import time
 from collections.abc import Sequence
+from pathlib import PurePosixPath
 from typing import TYPE_CHECKING, Any, Callable, TypedDict
 
 from docutils import nodes
@@ -116,9 +117,9 @@ def run(self) -> Sequence[nodes.Node]:
         save_path = self.options.get("save")
         plantuml_code_out_path = None
         if save_path:
-            if os.path.isabs(save_path):
+            if PurePosixPath(save_path).is_absolute():
                 raise NeedumlException(
-                    f"Given save path: {save_path}, is not a relative path."
+                    f"Given save path: {save_path}, is not a relative posix path."
                 )
             else:
                 plantuml_code_out_path = save_path

tests/__snapshots__/test_needimport.ambr

@@ -78,7 +78,7 @@
             'external_css': 'external_link',
             'id': 'REQ_1',
             'layout': '',
-            'lineno': 48,
+            'lineno': 47,
             'section_name': 'FILTERED',
             'sections': list([
               'FILTERED',
@@ -193,7 +193,7 @@
             'external_css': 'external_link',
             'id': 'SPEC_1',
             'layout': '',
-            'lineno': 51,
+            'lineno': 50,
             'section_name': 'FILTERED',
             'sections': list([
               'FILTERED',
@@ -1250,21 +1250,6 @@
             'type': 'req',
             'type_name': 'Requirement',
           }),
-          'small_depr_rel_path_TEST_01': dict({
-            'content': 'small_depr_rel_path_TEST_01',
-            'docname': 'subdoc/deprecated_rel_path_import',
-            'external_css': 'external_link',
-            'id': 'small_depr_rel_path_TEST_01',
-            'is_import': True,
-            'lineno': 6,
-            'section_name': 'Deprecated Relative path import test',
-            'sections': list([
-              'Deprecated Relative path import test',
-            ]),
-            'title': 'TEST_01 DESCRIPTION',
-            'type': 'impl',
-            'type_name': 'Implementation',
-          }),
           'small_rel_path_TEST_01': dict({
             'content': 'small_rel_path_TEST_01',
             'docname': 'subdoc/rel_path_import',
@@ -1635,7 +1620,7 @@
             'type_name': 'Test Case',
           }),
         }),
-        'needs_amount': 66,
+        'needs_amount': 65,
         'needs_defaults_removed': True,
         'needs_schema': dict({
           '$schema': 'http://json-schema.org/draft-07/schema#',

tests/conftest.py

@@ -56,6 +56,19 @@ def copy_srcdir_to_tmpdir(srcdir: path, tmp: path) -> path:
     return tmproot
 
 
+def create_src_files_in_tmpdir(files: list[tuple[Path, str]], tmp: path) -> path:
+    """Create source files in a temporary directory under the subdir src."""
+    subdir = path("src")
+    tmproot = tmp.joinpath(generate_random_string()) / subdir
+    tmproot.makedirs(exist_ok=True)
+    for file in files:
+        file_path, content = file
+        file_abs = tmproot.joinpath(str(file_path))
+        file_abs.parent.makedirs(exist_ok=True)
+        file_abs.write_text(content)
+    return tmproot
+
+
 def get_abspath(relpath: str) -> str:
     """
     Get the absolute path from a relative path.
@@ -266,9 +279,18 @@ def test_app(make_app, sphinx_test_tempdir, request):
         )
         sphinx_conf_overrides.update(plantuml=plantuml)
 
-    # copy test srcdir to test temporary directory sphinx_test_tempdir
     srcdir = builder_params.get("srcdir")
-    src_dir = copy_srcdir_to_tmpdir(srcdir, sphinx_test_tempdir)
+    files = builder_params.get("files")
+    if (srcdir is None) == (files is None):
+        raise ValueError("Exactly one of srcdir, files must not be None")
+
+    if srcdir is not None:
+        # copy test srcdir to test temporary directory sphinx_test_tempdir
+        src_dir = copy_srcdir_to_tmpdir(srcdir, sphinx_test_tempdir)
+    else:
+        # create given files in tmpdir
+        src_dir = create_src_files_in_tmpdir(files, sphinx_test_tempdir)
+
     parent_path = Path(str(src_dir.parent.abspath()))
 
     if version_info >= (7, 2):

tests/doc_test/import_doc/index.rst

@@ -43,7 +43,6 @@ FILTERED
    subdoc/filter
    subdoc/abs_path_import
    subdoc/rel_path_import
-   subdoc/deprecated_rel_path_import
 
 .. req:: Test requirement 1
    :id: REQ_1