From f644cc269753058f8d16f57eafa7eb041885a6a3 Mon Sep 17 00:00:00 2001 From: Mark Dickinson Date: Mon, 11 Sep 2023 17:22:58 +0100 Subject: [PATCH] Fix Trait documenter tests for Sphinx >= 7.2 (#1755) This PR fixes the Trait documenter test for Sphinx >= 7.2. For that version of Sphinx, the `srcdir` argument to `SphinxTestApp` needs to be a `pathlib.Path` object rather than a `sphinx.testing.path.path` object. Closes #1754 --- traits/util/tests/test_trait_documenter.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/traits/util/tests/test_trait_documenter.py b/traits/util/tests/test_trait_documenter.py index d06d36d46..b51430719 100644 --- a/traits/util/tests/test_trait_documenter.py +++ b/traits/util/tests/test_trait_documenter.py @@ -27,7 +27,6 @@ if sphinx is not None: from sphinx.ext.autodoc import ClassDocumenter, INSTANCEATTR, Options from sphinx.ext.autodoc.directive import DocumenterBridge - from sphinx.testing.path import path from sphinx.testing.util import SphinxTestApp from sphinx.util.docutils import LoggingReporter @@ -37,6 +36,11 @@ TraitDocumenter, ) + if sphinx.version_info < (7, 2): + from sphinx.testing.path import path as Path + else: + from pathlib import Path + # Configuration file content for testing. CONF_PY = """\ @@ -223,7 +227,7 @@ def create_directive(self): with open(conf_file, "w", encoding="utf-8") as f: f.write(CONF_PY) - app = SphinxTestApp(srcdir=path(tmpdir)) + app = SphinxTestApp(srcdir=Path(tmpdir)) app.builder.env.app = app app.builder.env.temp_data["docname"] = "dummy"