From f59bcd66271d7f904d2dd1de664d54837df83251 Mon Sep 17 00:00:00 2001 From: Chris Sewell Date: Thu, 10 Oct 2024 17:33:14 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=9B=20Fix=20plantuml=20top-level=20imp?= =?UTF-8?q?ort=20(#1328)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit `sphinxcontrib.plantuml` is optional, should not be a top-level import --- sphinx_needs/directives/needflow/_plantuml.py | 5 +---- sphinx_needs/directives/needgantt.py | 5 +---- sphinx_needs/directives/needsequence.py | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/sphinx_needs/directives/needflow/_plantuml.py b/sphinx_needs/directives/needflow/_plantuml.py index e4a8aa41f..ec264240c 100644 --- a/sphinx_needs/directives/needflow/_plantuml.py +++ b/sphinx_needs/directives/needflow/_plantuml.py @@ -7,9 +7,6 @@ from docutils import nodes from jinja2 import Template from sphinx.application import Sphinx -from sphinxcontrib.plantuml import ( - generate_name, # Need for plantuml filename calculation -) from sphinx_needs.config import LinkOptionsType, NeedsSphinxConfig from sphinx_needs.data import NeedsFlowType, NeedsInfoType, SphinxNeedsData @@ -244,7 +241,7 @@ def process_needflow_plantuml( try: if "sphinxcontrib.plantuml" not in app.config.extensions: raise ImportError - from sphinxcontrib.plantuml import plantuml + from sphinxcontrib.plantuml import generate_name, plantuml except ImportError: error_node = nodes.error() para = nodes.paragraph() diff --git a/sphinx_needs/directives/needgantt.py b/sphinx_needs/directives/needgantt.py index aa51d602f..1bb731c04 100644 --- a/sphinx_needs/directives/needgantt.py +++ b/sphinx_needs/directives/needgantt.py @@ -8,9 +8,6 @@ from docutils import nodes from docutils.parsers.rst import directives from sphinx.application import Sphinx -from sphinxcontrib.plantuml import ( - generate_name, # Need for plantuml filename calculation -) from sphinx_needs.config import NeedsSphinxConfig from sphinx_needs.data import NeedsGanttType, SphinxNeedsData @@ -176,7 +173,7 @@ def process_needgantt( try: if "sphinxcontrib.plantuml" not in app.config.extensions: raise ImportError - from sphinxcontrib.plantuml import plantuml + from sphinxcontrib.plantuml import generate_name, plantuml except ImportError: no_plantuml(node) continue diff --git a/sphinx_needs/directives/needsequence.py b/sphinx_needs/directives/needsequence.py index a1c16d6ca..d03c0b5d6 100644 --- a/sphinx_needs/directives/needsequence.py +++ b/sphinx_needs/directives/needsequence.py @@ -7,9 +7,6 @@ from docutils import nodes from docutils.parsers.rst import directives from sphinx.application import Sphinx -from sphinxcontrib.plantuml import ( - generate_name, # Need for plantuml filename calculation -) from sphinx_needs.config import NeedsSphinxConfig from sphinx_needs.data import NeedsInfoType, NeedsSequenceType, SphinxNeedsData @@ -124,7 +121,7 @@ def process_needsequence( try: if "sphinxcontrib.plantuml" not in app.config.extensions: raise ImportError - from sphinxcontrib.plantuml import plantuml + from sphinxcontrib.plantuml import generate_name, plantuml except ImportError: no_plantuml(node) continue