From 2a97e955c6f2a90b9f73dff38847b3e8c398cd6e Mon Sep 17 00:00:00 2001 From: Chris Sewell Date: Fri, 3 Nov 2023 11:17:01 +0100 Subject: [PATCH] =?UTF-8?q?=F0=9F=A7=AA=20Remove=20plantuml=20config=20fro?= =?UTF-8?q?m=20test=20builds=20conf.py=20(#1059)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit In #1051 setting of the `plantuml` config option was moved centrally into `test_app`. This commit removes the config from individual `conf.py` --- tests/doc_test/add_sections/conf.py | 7 ------- tests/doc_test/api_doc/conf.py | 7 ------- tests/doc_test/api_doc_awesome/conf.py | 7 ------- tests/doc_test/arch_doc/conf.py | 7 +------ tests/doc_test/broken_doc/conf.py | 7 ------- tests/doc_test/broken_links/conf.py | 7 ------- tests/doc_test/broken_statuses/conf.py | 7 ------- tests/doc_test/broken_syntax_doc/conf.py | 7 ------- tests/doc_test/broken_tags/conf.py | 7 ------- tests/doc_test/broken_tags_2/conf.py | 7 ------- tests/doc_test/doc_basic/conf.py | 6 +----- tests/doc_test/doc_basic_latex/conf.py | 6 +----- tests/doc_test/doc_build_latex/conf.py | 6 +----- tests/doc_test/doc_df_calc_sum/conf.py | 7 ------- tests/doc_test/doc_df_check_linked_values/conf.py | 7 ------- tests/doc_test/doc_df_user_functions/conf.py | 7 ------- tests/doc_test/doc_dynamic_functions/conf.py | 7 ------- tests/doc_test/doc_export_id/conf.py | 6 +----- tests/doc_test/doc_extra_links/conf.py | 6 +----- tests/doc_test/doc_github_issue_160/conf.py | 6 +----- tests/doc_test/doc_github_issue_21/conf.py | 7 ------- tests/doc_test/doc_github_issue_44/conf.py | 7 ------- tests/doc_test/doc_github_issue_61/conf.py | 6 +----- tests/doc_test/doc_global_options/conf.py | 7 ------- tests/doc_test/doc_layout/conf.py | 7 ------- tests/doc_test/doc_list2need/conf.py | 6 +----- tests/doc_test/doc_measure_time/conf.py | 4 +--- tests/doc_test/doc_need_count/conf.py | 7 ------- tests/doc_test/doc_need_delete/conf.py | 6 +----- tests/doc_test/doc_need_id_from_title/conf.py | 7 ------- tests/doc_test/doc_need_jinja_content/conf.py | 6 +----- tests/doc_test/doc_need_parts/conf.py | 7 ------- tests/doc_test/doc_needarch/conf.py | 6 +----- tests/doc_test/doc_needarch_jinja_func_import/conf.py | 6 +----- tests/doc_test/doc_needarch_jinja_func_need/conf.py | 6 +----- tests/doc_test/doc_needarch_negative_tests/conf.py | 6 +----- tests/doc_test/doc_needextend/conf.py | 7 ------- tests/doc_test/doc_needextend_strict/conf.py | 7 ------- tests/doc_test/doc_needextract/conf.py | 7 ------- tests/doc_test/doc_needflow/conf.py | 10 +++------- tests/doc_test/doc_needflow_incl_child_needs/conf.py | 11 +++-------- .../doc_needimport_download_needs_json/conf.py | 7 ------- .../conf.py | 7 ------- tests/doc_test/doc_needimport_noindex/conf.py | 7 +------ tests/doc_test/doc_needlist/conf.py | 7 ------- tests/doc_test/doc_needpie/conf.py | 10 +++------- tests/doc_test/doc_needs_builder/conf.py | 7 ------- .../doc_test/doc_needs_builder_negative_tests/conf.py | 7 ------- tests/doc_test/doc_needs_builder_parallel/conf.py | 7 ------- tests/doc_test/doc_needs_external_needs/conf.py | 10 +++------- .../doc_test/doc_needs_external_needs_remote/conf.py | 10 +++------- .../doc_needs_external_needs_with_target_url/conf.py | 10 +++------- tests/doc_test/doc_needs_filter_data/conf.py | 8 +++----- tests/doc_test/doc_needs_warnings/conf.py | 7 ------- .../doc_needs_warnings_return_status_code/conf.py | 7 ------- tests/doc_test/doc_needsfile/conf.py | 7 ------- tests/doc_test/doc_needtable/conf.py | 7 ------- tests/doc_test/doc_needuml/conf.py | 10 +++------- .../doc_test/doc_needuml_diagram_allowmixing/conf.py | 10 +++------- tests/doc_test/doc_needuml_duplicate_key/conf.py | 10 +++------- tests/doc_test/doc_needuml_filter/conf.py | 10 +++------- tests/doc_test/doc_needuml_jinja_func_flow/conf.py | 10 +++------- .../conf.py | 10 +++------- .../doc_needuml_jinja_func_need_removed/conf.py | 10 +++------- tests/doc_test/doc_needuml_jinja_func_ref/conf.py | 10 +++------- tests/doc_test/doc_needuml_key_name_diagram/conf.py | 10 +++------- tests/doc_test/doc_needuml_save/conf.py | 10 +++------- tests/doc_test/doc_needuml_save_with_abs_path/conf.py | 10 +++------- tests/doc_test/doc_open_needs_service/conf.py | 6 ------ tests/doc_test/doc_report_dead_links_false/conf.py | 10 +++------- tests/doc_test/doc_report_dead_links_true/conf.py | 10 +++------- tests/doc_test/doc_role_need_max_title_length/conf.py | 7 ------- .../doc_role_need_max_title_length_unlimited/conf.py | 7 ------- tests/doc_test/doc_role_need_template/conf.py | 7 ------- tests/doc_test/doc_style_blank/conf.py | 7 ------- tests/doc_test/doc_style_custom/conf.py | 5 ----- tests/doc_test/doc_style_modern/conf.py | 7 ------- tests/doc_test/doc_style_unknown/conf.py | 7 ------- tests/doc_test/external_doc/conf.py | 8 +++----- tests/doc_test/extra_options/conf.py | 7 ------- tests/doc_test/filter_doc/conf.py | 7 ------- tests/doc_test/generic_doc/conf.py | 7 ------- tests/doc_test/import_doc/conf.py | 7 ------- tests/doc_test/import_doc_empty/conf.py | 7 ------- tests/doc_test/import_doc_invalid/conf.py | 7 ------- tests/doc_test/multiple_link_backs/conf.py | 7 ------- tests/doc_test/need_constraints/conf.py | 7 ------- tests/doc_test/need_constraints_failed/conf.py | 7 ------- tests/doc_test/needextract_with_nested_needs/conf.py | 7 ------- tests/doc_test/needpie_with_zero_needs/conf.py | 7 ------- tests/doc_test/non_exists_file_import/conf.py | 7 ------- tests/doc_test/parallel_doc/conf.py | 6 ------ tests/doc_test/role_need_doc/conf.py | 8 +++----- tests/doc_test/service_doc/conf.py | 8 -------- tests/doc_test/title_from_content/conf.py | 7 ------- tests/doc_test/title_optional/conf.py | 7 ------- tests/doc_test/unicode_support/conf.py | 7 ------- tests/doc_test/variant_doc/conf.py | 11 +++-------- tests/doc_test/variant_options/conf.py | 10 +++------- 99 files changed, 89 insertions(+), 652 deletions(-) diff --git a/tests/doc_test/add_sections/conf.py b/tests/doc_test/add_sections/conf.py index 26e38c1ad..c684207da 100644 --- a/tests/doc_test/add_sections/conf.py +++ b/tests/doc_test/add_sections/conf.py @@ -1,14 +1,7 @@ -import os - from docutils.parsers.rst import directives extensions = ["sphinx_needs"] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" - needs_extra_options = { "introduced": directives.unchanged, "updated": directives.unchanged, diff --git a/tests/doc_test/api_doc/conf.py b/tests/doc_test/api_doc/conf.py index b177eff0c..7832f346d 100644 --- a/tests/doc_test/api_doc/conf.py +++ b/tests/doc_test/api_doc/conf.py @@ -1,12 +1,5 @@ -import os - extensions = ["sphinx_needs", "dummy_extension.dummy"] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" - needs_types = [ {"directive": "story", "title": "User Story", "prefix": "US_", "color": "#BFD8D2", "style": "node"}, {"directive": "spec", "title": "Specification", "prefix": "SP_", "color": "#FEDCD2", "style": "node"}, diff --git a/tests/doc_test/api_doc_awesome/conf.py b/tests/doc_test/api_doc_awesome/conf.py index b177eff0c..7832f346d 100644 --- a/tests/doc_test/api_doc_awesome/conf.py +++ b/tests/doc_test/api_doc_awesome/conf.py @@ -1,12 +1,5 @@ -import os - extensions = ["sphinx_needs", "dummy_extension.dummy"] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" - needs_types = [ {"directive": "story", "title": "User Story", "prefix": "US_", "color": "#BFD8D2", "style": "node"}, {"directive": "spec", "title": "Specification", "prefix": "SP_", "color": "#FEDCD2", "style": "node"}, diff --git a/tests/doc_test/arch_doc/conf.py b/tests/doc_test/arch_doc/conf.py index a98223d82..1571c763f 100644 --- a/tests/doc_test/arch_doc/conf.py +++ b/tests/doc_test/arch_doc/conf.py @@ -1,10 +1,5 @@ -import os - extensions = ["sphinx_needs", "sphinxcontrib.plantuml"] - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) +# note, the plantuml executable command is set globally in the test suite plantuml_output_format = "svg" needs_types = [ diff --git a/tests/doc_test/broken_doc/conf.py b/tests/doc_test/broken_doc/conf.py index 5669e9b09..21eab6d52 100644 --- a/tests/doc_test/broken_doc/conf.py +++ b/tests/doc_test/broken_doc/conf.py @@ -1,12 +1,5 @@ -import os - extensions = ["sphinx_needs"] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" - needs_types = [ {"directive": "story", "title": "User Story", "prefix": "US_", "color": "#BFD8D2", "style": "node"}, {"directive": "spec", "title": "Specification", "prefix": "SP_", "color": "#FEDCD2", "style": "node"}, diff --git a/tests/doc_test/broken_links/conf.py b/tests/doc_test/broken_links/conf.py index 5669e9b09..21eab6d52 100644 --- a/tests/doc_test/broken_links/conf.py +++ b/tests/doc_test/broken_links/conf.py @@ -1,12 +1,5 @@ -import os - extensions = ["sphinx_needs"] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" - needs_types = [ {"directive": "story", "title": "User Story", "prefix": "US_", "color": "#BFD8D2", "style": "node"}, {"directive": "spec", "title": "Specification", "prefix": "SP_", "color": "#FEDCD2", "style": "node"}, diff --git a/tests/doc_test/broken_statuses/conf.py b/tests/doc_test/broken_statuses/conf.py index 4d832f461..3706ca5ff 100644 --- a/tests/doc_test/broken_statuses/conf.py +++ b/tests/doc_test/broken_statuses/conf.py @@ -1,12 +1,5 @@ -import os - extensions = ["sphinx_needs"] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" - needs_types = [ {"directive": "story", "title": "User Story", "prefix": "US_", "color": "#BFD8D2", "style": "node"}, {"directive": "spec", "title": "Specification", "prefix": "SP_", "color": "#FEDCD2", "style": "node"}, diff --git a/tests/doc_test/broken_syntax_doc/conf.py b/tests/doc_test/broken_syntax_doc/conf.py index 5669e9b09..21eab6d52 100644 --- a/tests/doc_test/broken_syntax_doc/conf.py +++ b/tests/doc_test/broken_syntax_doc/conf.py @@ -1,12 +1,5 @@ -import os - extensions = ["sphinx_needs"] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" - needs_types = [ {"directive": "story", "title": "User Story", "prefix": "US_", "color": "#BFD8D2", "style": "node"}, {"directive": "spec", "title": "Specification", "prefix": "SP_", "color": "#FEDCD2", "style": "node"}, diff --git a/tests/doc_test/broken_tags/conf.py b/tests/doc_test/broken_tags/conf.py index 74231fd88..7c04d916c 100644 --- a/tests/doc_test/broken_tags/conf.py +++ b/tests/doc_test/broken_tags/conf.py @@ -1,12 +1,5 @@ -import os - extensions = ["sphinx_needs"] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" - needs_types = [ {"directive": "story", "title": "User Story", "prefix": "US_", "color": "#BFD8D2", "style": "node"}, {"directive": "spec", "title": "Specification", "prefix": "SP_", "color": "#FEDCD2", "style": "node"}, diff --git a/tests/doc_test/broken_tags_2/conf.py b/tests/doc_test/broken_tags_2/conf.py index 74231fd88..7c04d916c 100644 --- a/tests/doc_test/broken_tags_2/conf.py +++ b/tests/doc_test/broken_tags_2/conf.py @@ -1,12 +1,5 @@ -import os - extensions = ["sphinx_needs"] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" - needs_types = [ {"directive": "story", "title": "User Story", "prefix": "US_", "color": "#BFD8D2", "style": "node"}, {"directive": "spec", "title": "Specification", "prefix": "SP_", "color": "#FEDCD2", "style": "node"}, diff --git a/tests/doc_test/doc_basic/conf.py b/tests/doc_test/doc_basic/conf.py index 13694c5cd..0a5cb1761 100644 --- a/tests/doc_test/doc_basic/conf.py +++ b/tests/doc_test/doc_basic/conf.py @@ -1,10 +1,6 @@ -import os - extensions = ["sphinx_needs", "sphinxcontrib.plantuml"] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) +# note, the plantuml executable command is set globally in the test suite plantuml_output_format = "svg" needs_id_regex = "^[A-Za-z0-9_]" diff --git a/tests/doc_test/doc_basic_latex/conf.py b/tests/doc_test/doc_basic_latex/conf.py index ac6f89ce9..32f8e8de5 100644 --- a/tests/doc_test/doc_basic_latex/conf.py +++ b/tests/doc_test/doc_basic_latex/conf.py @@ -1,12 +1,8 @@ -import os - project = "basic test" extensions = ["sphinx_needs", "sphinxcontrib.plantuml"] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) +# note, the plantuml executable command is set globally in the test suite plantuml_output_format = "svg" needs_id_regex = "^[A-Za-z0-9_]" diff --git a/tests/doc_test/doc_build_latex/conf.py b/tests/doc_test/doc_build_latex/conf.py index 5aa8650a3..6a81ad4bb 100644 --- a/tests/doc_test/doc_build_latex/conf.py +++ b/tests/doc_test/doc_build_latex/conf.py @@ -1,12 +1,8 @@ -import os - project = "needs test docs" extensions = ["sphinx_needs", "sphinxcontrib.plantuml"] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) +# note, the plantuml executable command is set globally in the test suite plantuml_output_format = "svg" # figures, tables and code-blocks are automatically numbered if they have a caption diff --git a/tests/doc_test/doc_df_calc_sum/conf.py b/tests/doc_test/doc_df_calc_sum/conf.py index 0d9612327..2e1bb2cf3 100644 --- a/tests/doc_test/doc_df_calc_sum/conf.py +++ b/tests/doc_test/doc_df_calc_sum/conf.py @@ -1,14 +1,7 @@ -import os - from docutils.parsers.rst import directives extensions = ["sphinx_needs"] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" - needs_types = [ {"directive": "story", "title": "User Story", "prefix": "US_", "color": "#BFD8D2", "style": "node"}, {"directive": "spec", "title": "Specification", "prefix": "SP_", "color": "#FEDCD2", "style": "node"}, diff --git a/tests/doc_test/doc_df_check_linked_values/conf.py b/tests/doc_test/doc_df_check_linked_values/conf.py index f8894d720..707f3afad 100644 --- a/tests/doc_test/doc_df_check_linked_values/conf.py +++ b/tests/doc_test/doc_df_check_linked_values/conf.py @@ -1,14 +1,7 @@ -import os - from docutils.parsers.rst import directives extensions = ["sphinx_needs"] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" - needs_types = [ {"directive": "story", "title": "User Story", "prefix": "US_", "color": "#BFD8D2", "style": "node"}, {"directive": "spec", "title": "Specification", "prefix": "SP_", "color": "#FEDCD2", "style": "node"}, diff --git a/tests/doc_test/doc_df_user_functions/conf.py b/tests/doc_test/doc_df_user_functions/conf.py index 769162f8f..07958c0c0 100644 --- a/tests/doc_test/doc_df_user_functions/conf.py +++ b/tests/doc_test/doc_df_user_functions/conf.py @@ -1,14 +1,7 @@ -import os - from docutils.parsers.rst import directives extensions = ["sphinx_needs"] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" - needs_types = [ {"directive": "story", "title": "User Story", "prefix": "US_", "color": "#BFD8D2", "style": "node"}, {"directive": "spec", "title": "Specification", "prefix": "SP_", "color": "#FEDCD2", "style": "node"}, diff --git a/tests/doc_test/doc_dynamic_functions/conf.py b/tests/doc_test/doc_dynamic_functions/conf.py index eb9084a19..5097fc12d 100644 --- a/tests/doc_test/doc_dynamic_functions/conf.py +++ b/tests/doc_test/doc_dynamic_functions/conf.py @@ -1,14 +1,7 @@ -import os - from docutils.parsers.rst import directives extensions = ["sphinx_needs"] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" - needs_types = [ {"directive": "story", "title": "User Story", "prefix": "US_", "color": "#BFD8D2", "style": "node"}, {"directive": "spec", "title": "Specification", "prefix": "SP_", "color": "#FEDCD2", "style": "node"}, diff --git a/tests/doc_test/doc_export_id/conf.py b/tests/doc_test/doc_export_id/conf.py index fb7ffd634..34095785f 100644 --- a/tests/doc_test/doc_export_id/conf.py +++ b/tests/doc_test/doc_export_id/conf.py @@ -1,12 +1,8 @@ -import os - version = "1.0" extensions = ["sphinx_needs", "sphinxcontrib.plantuml"] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) +# note, the plantuml executable command is set globally in the test suite plantuml_output_format = "svg" needs_types = [ diff --git a/tests/doc_test/doc_extra_links/conf.py b/tests/doc_test/doc_extra_links/conf.py index b2b0e1a1b..ad8a7f24e 100644 --- a/tests/doc_test/doc_extra_links/conf.py +++ b/tests/doc_test/doc_extra_links/conf.py @@ -1,12 +1,8 @@ -import os - project = "needs test docs" extensions = ["sphinx_needs", "sphinxcontrib.plantuml"] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) +# note, the plantuml executable command is set globally in the test suite plantuml_output_format = "svg" needs_types = [ diff --git a/tests/doc_test/doc_github_issue_160/conf.py b/tests/doc_test/doc_github_issue_160/conf.py index b3702e97f..25247cd89 100644 --- a/tests/doc_test/doc_github_issue_160/conf.py +++ b/tests/doc_test/doc_github_issue_160/conf.py @@ -1,10 +1,6 @@ -import os - extensions = ["sphinx_needs", "sphinxcontrib.plantuml"] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) +# note, the plantuml executable command is set globally in the test suite plantuml_output_format = "svg" needs_id_regex = "^[A-Z0-9]-[A-Z0-9]+" diff --git a/tests/doc_test/doc_github_issue_21/conf.py b/tests/doc_test/doc_github_issue_21/conf.py index 5669e9b09..21eab6d52 100644 --- a/tests/doc_test/doc_github_issue_21/conf.py +++ b/tests/doc_test/doc_github_issue_21/conf.py @@ -1,12 +1,5 @@ -import os - extensions = ["sphinx_needs"] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" - needs_types = [ {"directive": "story", "title": "User Story", "prefix": "US_", "color": "#BFD8D2", "style": "node"}, {"directive": "spec", "title": "Specification", "prefix": "SP_", "color": "#FEDCD2", "style": "node"}, diff --git a/tests/doc_test/doc_github_issue_44/conf.py b/tests/doc_test/doc_github_issue_44/conf.py index 15bcd7517..df3fe57f8 100644 --- a/tests/doc_test/doc_github_issue_44/conf.py +++ b/tests/doc_test/doc_github_issue_44/conf.py @@ -1,12 +1,5 @@ -import os - extensions = ["sphinx_needs"] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" - needs_id_regex = "^[A-Za-z0-9_]" needs_types = [ diff --git a/tests/doc_test/doc_github_issue_61/conf.py b/tests/doc_test/doc_github_issue_61/conf.py index b3702e97f..25247cd89 100644 --- a/tests/doc_test/doc_github_issue_61/conf.py +++ b/tests/doc_test/doc_github_issue_61/conf.py @@ -1,10 +1,6 @@ -import os - extensions = ["sphinx_needs", "sphinxcontrib.plantuml"] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) +# note, the plantuml executable command is set globally in the test suite plantuml_output_format = "svg" needs_id_regex = "^[A-Z0-9]-[A-Z0-9]+" diff --git a/tests/doc_test/doc_global_options/conf.py b/tests/doc_test/doc_global_options/conf.py index 88a32691d..46408adc5 100644 --- a/tests/doc_test/doc_global_options/conf.py +++ b/tests/doc_test/doc_global_options/conf.py @@ -1,12 +1,5 @@ -import os - extensions = ["sphinx_needs"] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" - needs_types = [ {"directive": "story", "title": "User Story", "prefix": "US_", "color": "#BFD8D2", "style": "node"}, {"directive": "spec", "title": "Specification", "prefix": "SP_", "color": "#FEDCD2", "style": "node"}, diff --git a/tests/doc_test/doc_layout/conf.py b/tests/doc_test/doc_layout/conf.py index adcc07d7f..6969f1c23 100644 --- a/tests/doc_test/doc_layout/conf.py +++ b/tests/doc_test/doc_layout/conf.py @@ -1,14 +1,7 @@ -import os - from docutils.parsers.rst import directives extensions = ["sphinx_needs"] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" - needs_types = [ {"directive": "story", "title": "User Story", "prefix": "US_", "color": "#BFD8D2", "style": "node"}, {"directive": "spec", "title": "Specification", "prefix": "SP_", "color": "#FEDCD2", "style": "node"}, diff --git a/tests/doc_test/doc_list2need/conf.py b/tests/doc_test/doc_list2need/conf.py index 4805621e5..009477a1b 100644 --- a/tests/doc_test/doc_list2need/conf.py +++ b/tests/doc_test/doc_list2need/conf.py @@ -1,10 +1,6 @@ -import os - extensions = ["sphinx_needs", "sphinxcontrib.plantuml"] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) +# note, the plantuml executable command is set globally in the test suite plantuml_output_format = "svg" needs_table_style = "TABLE" diff --git a/tests/doc_test/doc_measure_time/conf.py b/tests/doc_test/doc_measure_time/conf.py index 87be107ad..74f164462 100644 --- a/tests/doc_test/doc_measure_time/conf.py +++ b/tests/doc_test/doc_measure_time/conf.py @@ -9,9 +9,7 @@ extensions = ["sphinx_needs", "sphinxcontrib.plantuml"] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) +# note, the plantuml executable command is set globally in the test suite plantuml_output_format = "svg" needs_debug_measurement = True diff --git a/tests/doc_test/doc_need_count/conf.py b/tests/doc_test/doc_need_count/conf.py index 5669e9b09..21eab6d52 100644 --- a/tests/doc_test/doc_need_count/conf.py +++ b/tests/doc_test/doc_need_count/conf.py @@ -1,12 +1,5 @@ -import os - extensions = ["sphinx_needs"] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" - needs_types = [ {"directive": "story", "title": "User Story", "prefix": "US_", "color": "#BFD8D2", "style": "node"}, {"directive": "spec", "title": "Specification", "prefix": "SP_", "color": "#FEDCD2", "style": "node"}, diff --git a/tests/doc_test/doc_need_delete/conf.py b/tests/doc_test/doc_need_delete/conf.py index 76c7bb1b8..104609b54 100644 --- a/tests/doc_test/doc_need_delete/conf.py +++ b/tests/doc_test/doc_need_delete/conf.py @@ -1,10 +1,6 @@ -import os - extensions = ["sphinx_needs", "sphinxcontrib.plantuml"] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) +# note, the plantuml executable command is set globally in the test suite plantuml_output_format = "svg" needs_id_regex = "^[A-Za-z0-9_]" diff --git a/tests/doc_test/doc_need_id_from_title/conf.py b/tests/doc_test/doc_need_id_from_title/conf.py index b7134f2fc..e3a53e73b 100644 --- a/tests/doc_test/doc_need_id_from_title/conf.py +++ b/tests/doc_test/doc_need_id_from_title/conf.py @@ -1,12 +1,5 @@ -import os - extensions = ["sphinx_needs"] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" - needs_types = [ {"directive": "story", "title": "User Story", "prefix": "US_", "color": "#BFD8D2", "style": "node"}, {"directive": "spec", "title": "Specification", "prefix": "SP_", "color": "#FEDCD2", "style": "node"}, diff --git a/tests/doc_test/doc_need_jinja_content/conf.py b/tests/doc_test/doc_need_jinja_content/conf.py index 11dbcbd5c..3f7d3cdd7 100644 --- a/tests/doc_test/doc_need_jinja_content/conf.py +++ b/tests/doc_test/doc_need_jinja_content/conf.py @@ -1,10 +1,6 @@ -import os - extensions = ["sphinx_needs", "sphinxcontrib.plantuml"] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) +# note, the plantuml executable command is set globally in the test suite plantuml_output_format = "svg" needs_id_regex = "^[A-Za-z0-9_]" diff --git a/tests/doc_test/doc_need_parts/conf.py b/tests/doc_test/doc_need_parts/conf.py index 5669e9b09..21eab6d52 100644 --- a/tests/doc_test/doc_need_parts/conf.py +++ b/tests/doc_test/doc_need_parts/conf.py @@ -1,12 +1,5 @@ -import os - extensions = ["sphinx_needs"] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" - needs_types = [ {"directive": "story", "title": "User Story", "prefix": "US_", "color": "#BFD8D2", "style": "node"}, {"directive": "spec", "title": "Specification", "prefix": "SP_", "color": "#FEDCD2", "style": "node"}, diff --git a/tests/doc_test/doc_needarch/conf.py b/tests/doc_test/doc_needarch/conf.py index 6a4ac75e9..1666acffc 100644 --- a/tests/doc_test/doc_needarch/conf.py +++ b/tests/doc_test/doc_needarch/conf.py @@ -1,10 +1,6 @@ -import os - extensions = ["sphinx_needs", "sphinxcontrib.plantuml"] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) +# note, the plantuml executable command is set globally in the test suite plantuml_output_format = "svg" needs_table_style = "TABLE" diff --git a/tests/doc_test/doc_needarch_jinja_func_import/conf.py b/tests/doc_test/doc_needarch_jinja_func_import/conf.py index facceaa58..dfccf97c2 100644 --- a/tests/doc_test/doc_needarch_jinja_func_import/conf.py +++ b/tests/doc_test/doc_needarch_jinja_func_import/conf.py @@ -1,10 +1,6 @@ -import os - extensions = ["sphinx_needs", "sphinxcontrib.plantuml"] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) +# note, the plantuml executable command is set globally in the test suite plantuml_output_format = "svg" needs_types = [ diff --git a/tests/doc_test/doc_needarch_jinja_func_need/conf.py b/tests/doc_test/doc_needarch_jinja_func_need/conf.py index 6a4ac75e9..1666acffc 100644 --- a/tests/doc_test/doc_needarch_jinja_func_need/conf.py +++ b/tests/doc_test/doc_needarch_jinja_func_need/conf.py @@ -1,10 +1,6 @@ -import os - extensions = ["sphinx_needs", "sphinxcontrib.plantuml"] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) +# note, the plantuml executable command is set globally in the test suite plantuml_output_format = "svg" needs_table_style = "TABLE" diff --git a/tests/doc_test/doc_needarch_negative_tests/conf.py b/tests/doc_test/doc_needarch_negative_tests/conf.py index 6a4ac75e9..1666acffc 100644 --- a/tests/doc_test/doc_needarch_negative_tests/conf.py +++ b/tests/doc_test/doc_needarch_negative_tests/conf.py @@ -1,10 +1,6 @@ -import os - extensions = ["sphinx_needs", "sphinxcontrib.plantuml"] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) +# note, the plantuml executable command is set globally in the test suite plantuml_output_format = "svg" needs_table_style = "TABLE" diff --git a/tests/doc_test/doc_needextend/conf.py b/tests/doc_test/doc_needextend/conf.py index 7f111502f..08df9747f 100644 --- a/tests/doc_test/doc_needextend/conf.py +++ b/tests/doc_test/doc_needextend/conf.py @@ -1,5 +1,3 @@ -import os - extensions = ["sphinx_needs"] needs_build_json = True @@ -10,8 +8,3 @@ {"directive": "impl", "title": "Implementation", "prefix": "IM_", "color": "#DF744A", "style": "node"}, {"directive": "test", "title": "Test Case", "prefix": "TC_", "color": "#DCB239", "style": "node"}, ] - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/doc_needextend_strict/conf.py b/tests/doc_test/doc_needextend_strict/conf.py index 4e7116d36..6b4b9fa9d 100644 --- a/tests/doc_test/doc_needextend_strict/conf.py +++ b/tests/doc_test/doc_needextend_strict/conf.py @@ -1,5 +1,3 @@ -import os - extensions = ["sphinx_needs"] needs_id_regex = "^[A-Za-z0-9_]*" @@ -9,8 +7,3 @@ {"directive": "impl", "title": "Implementation", "prefix": "IM_", "color": "#DF744A", "style": "node"}, {"directive": "test", "title": "Test Case", "prefix": "TC_", "color": "#DCB239", "style": "node"}, ] - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/doc_needextract/conf.py b/tests/doc_test/doc_needextract/conf.py index c71f0ce23..47badfa7d 100644 --- a/tests/doc_test/doc_needextract/conf.py +++ b/tests/doc_test/doc_needextract/conf.py @@ -1,5 +1,3 @@ -import os - extensions = ["sphinx_needs"] rst_prolog = """ @@ -15,8 +13,3 @@ {"directive": "impl", "title": "Implementation", "prefix": "IM_", "color": "#DF744A", "style": "node"}, {"directive": "test", "title": "Test Case", "prefix": "TC_", "color": "#DCB239", "style": "node"}, ] - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/doc_needflow/conf.py b/tests/doc_test/doc_needflow/conf.py index 5ff80aeaa..aa6219420 100644 --- a/tests/doc_test/doc_needflow/conf.py +++ b/tests/doc_test/doc_needflow/conf.py @@ -1,7 +1,8 @@ -import os - extensions = ["sphinx_needs", "sphinxcontrib.plantuml"] +# note, the plantuml executable command is set globally in the test suite +plantuml_output_format = "svg" + needs_table_style = "TABLE" needs_id_regex = "^[A-Za-z0-9_]" @@ -12,8 +13,3 @@ {"directive": "impl", "title": "Implementation", "prefix": "IM_", "color": "#DF744A", "style": "node"}, {"directive": "test", "title": "Test Case", "prefix": "TC_", "color": "#DCB239", "style": "node"}, ] - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/doc_needflow_incl_child_needs/conf.py b/tests/doc_test/doc_needflow_incl_child_needs/conf.py index d6c00f39e..24b1cbd1b 100644 --- a/tests/doc_test/doc_needflow_incl_child_needs/conf.py +++ b/tests/doc_test/doc_needflow_incl_child_needs/conf.py @@ -1,7 +1,8 @@ -import os - extensions = ["sphinx_needs", "sphinxcontrib.plantuml"] +# note, the plantuml executable command is set globally in the test suite +plantuml_output_format = "svg" + needs_table_style = "TABLE" needs_id_regex = "^[A-Za-z0-9_]" @@ -27,9 +28,3 @@ # "allow_dead_links": True, # }, # ] - - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/doc_needimport_download_needs_json/conf.py b/tests/doc_test/doc_needimport_download_needs_json/conf.py index 6c0a46f6b..885bd47d6 100644 --- a/tests/doc_test/doc_needimport_download_needs_json/conf.py +++ b/tests/doc_test/doc_needimport_download_needs_json/conf.py @@ -1,5 +1,3 @@ -import os - extensions = ["sphinx_needs"] needs_table_style = "TABLE" @@ -10,8 +8,3 @@ {"directive": "impl", "title": "Implementation", "prefix": "IM_", "color": "#DF744A", "style": "node"}, {"directive": "test", "title": "Test Case", "prefix": "TC_", "color": "#DCB239", "style": "node"}, ] - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/doc_needimport_download_needs_json_negative/conf.py b/tests/doc_test/doc_needimport_download_needs_json_negative/conf.py index 6c0a46f6b..885bd47d6 100644 --- a/tests/doc_test/doc_needimport_download_needs_json_negative/conf.py +++ b/tests/doc_test/doc_needimport_download_needs_json_negative/conf.py @@ -1,5 +1,3 @@ -import os - extensions = ["sphinx_needs"] needs_table_style = "TABLE" @@ -10,8 +8,3 @@ {"directive": "impl", "title": "Implementation", "prefix": "IM_", "color": "#DF744A", "style": "node"}, {"directive": "test", "title": "Test Case", "prefix": "TC_", "color": "#DCB239", "style": "node"}, ] - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/doc_needimport_noindex/conf.py b/tests/doc_test/doc_needimport_noindex/conf.py index bce8665e6..e9342e0ea 100644 --- a/tests/doc_test/doc_needimport_noindex/conf.py +++ b/tests/doc_test/doc_needimport_noindex/conf.py @@ -1,5 +1,3 @@ -import os - project = "needs test docs" master_doc = "intro" @@ -8,8 +6,5 @@ # figures, tables and code-blocks are automatically numbered if they have a caption numfig = True - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) +# note, the plantuml executable command is set globally in the test suite plantuml_output_format = "svg" diff --git a/tests/doc_test/doc_needlist/conf.py b/tests/doc_test/doc_needlist/conf.py index 6c0a46f6b..885bd47d6 100644 --- a/tests/doc_test/doc_needlist/conf.py +++ b/tests/doc_test/doc_needlist/conf.py @@ -1,5 +1,3 @@ -import os - extensions = ["sphinx_needs"] needs_table_style = "TABLE" @@ -10,8 +8,3 @@ {"directive": "impl", "title": "Implementation", "prefix": "IM_", "color": "#DF744A", "style": "node"}, {"directive": "test", "title": "Test Case", "prefix": "TC_", "color": "#DCB239", "style": "node"}, ] - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/doc_needpie/conf.py b/tests/doc_test/doc_needpie/conf.py index 98640e4e8..86ef3ff45 100644 --- a/tests/doc_test/doc_needpie/conf.py +++ b/tests/doc_test/doc_needpie/conf.py @@ -1,7 +1,8 @@ -import os - extensions = ["sphinx_needs", "sphinxcontrib.plantuml"] +# note, the plantuml executable command is set globally in the test suite +plantuml_output_format = "svg" + needs_table_style = "TABLE" needs_id_regex = "^[A-Za-z0-9_]" @@ -14,8 +15,3 @@ ] needs_extra_options = ["author"] - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/doc_needs_builder/conf.py b/tests/doc_test/doc_needs_builder/conf.py index 09eddcb8e..ce1cbf2cf 100644 --- a/tests/doc_test/doc_needs_builder/conf.py +++ b/tests/doc_test/doc_needs_builder/conf.py @@ -1,5 +1,3 @@ -import os - version = "1.0" extensions = ["sphinx_needs"] @@ -13,9 +11,4 @@ {"directive": "test", "title": "Test Case", "prefix": "TC_", "color": "#DCB239", "style": "node"}, ] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" - needs_file = "custom_needs_test.json" diff --git a/tests/doc_test/doc_needs_builder_negative_tests/conf.py b/tests/doc_test/doc_needs_builder_negative_tests/conf.py index 6c0a46f6b..885bd47d6 100644 --- a/tests/doc_test/doc_needs_builder_negative_tests/conf.py +++ b/tests/doc_test/doc_needs_builder_negative_tests/conf.py @@ -1,5 +1,3 @@ -import os - extensions = ["sphinx_needs"] needs_table_style = "TABLE" @@ -10,8 +8,3 @@ {"directive": "impl", "title": "Implementation", "prefix": "IM_", "color": "#DF744A", "style": "node"}, {"directive": "test", "title": "Test Case", "prefix": "TC_", "color": "#DCB239", "style": "node"}, ] - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/doc_needs_builder_parallel/conf.py b/tests/doc_test/doc_needs_builder_parallel/conf.py index 268a11ca3..87abb2f42 100644 --- a/tests/doc_test/doc_needs_builder_parallel/conf.py +++ b/tests/doc_test/doc_needs_builder_parallel/conf.py @@ -1,5 +1,3 @@ -import os - version = "1.0" extensions = ["sphinx_needs"] @@ -15,9 +13,4 @@ {"directive": "test", "title": "Test Case", "prefix": "TC_", "color": "#DCB239", "style": "node"}, ] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" - needs_file = "custom_needs_test.json" diff --git a/tests/doc_test/doc_needs_external_needs/conf.py b/tests/doc_test/doc_needs_external_needs/conf.py index be8231d5c..95e5cee80 100644 --- a/tests/doc_test/doc_needs_external_needs/conf.py +++ b/tests/doc_test/doc_needs_external_needs/conf.py @@ -1,7 +1,8 @@ -import os - extensions = ["sphinx_needs", "sphinxcontrib.plantuml"] +# note, the plantuml executable command is set globally in the test suite +plantuml_output_format = "svg" + needs_table_style = "TABLE" needs_types = [ @@ -11,11 +12,6 @@ {"directive": "test", "title": "Test Case", "prefix": "TC_", "color": "#DCB239", "style": "node"}, ] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" - needs_external_needs = [ {"base_url": "http://my_company.com/docs/v1/", "json_path": "needs_test_small.json", "id_prefix": "ext_"}, {"base_url": "../../_build/html", "json_path": "needs_test_small.json", "id_prefix": "ext_rel_path_"}, diff --git a/tests/doc_test/doc_needs_external_needs_remote/conf.py b/tests/doc_test/doc_needs_external_needs_remote/conf.py index 9f242fa1d..b63ea602c 100644 --- a/tests/doc_test/doc_needs_external_needs_remote/conf.py +++ b/tests/doc_test/doc_needs_external_needs_remote/conf.py @@ -1,7 +1,8 @@ -import os - extensions = ["sphinx_needs", "sphinxcontrib.plantuml"] +# note, the plantuml executable command is set globally in the test suite +plantuml_output_format = "svg" + needs_table_style = "TABLE" needs_types = [ @@ -11,11 +12,6 @@ {"directive": "test", "title": "Test Case", "prefix": "TC_", "color": "#DCB239", "style": "node"}, ] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" - needs_external_needs = [ { "base_url": "http://my_company.com/docs/v1/", diff --git a/tests/doc_test/doc_needs_external_needs_with_target_url/conf.py b/tests/doc_test/doc_needs_external_needs_with_target_url/conf.py index 0e094cd55..d4c198d2d 100644 --- a/tests/doc_test/doc_needs_external_needs_with_target_url/conf.py +++ b/tests/doc_test/doc_needs_external_needs_with_target_url/conf.py @@ -1,7 +1,8 @@ -import os - extensions = ["sphinx_needs", "sphinxcontrib.plantuml"] +# note, the plantuml executable command is set globally in the test suite +plantuml_output_format = "svg" + needs_table_style = "TABLE" needs_types = [ @@ -11,11 +12,6 @@ {"directive": "test", "title": "Test Case", "prefix": "TC_", "color": "#DCB239", "style": "node"}, ] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" - needs_external_needs = [ { "base_url": "http://my_company.com/docs/v1/", diff --git a/tests/doc_test/doc_needs_filter_data/conf.py b/tests/doc_test/doc_needs_filter_data/conf.py index bd9178810..23aa68579 100644 --- a/tests/doc_test/doc_needs_filter_data/conf.py +++ b/tests/doc_test/doc_needs_filter_data/conf.py @@ -7,6 +7,9 @@ extensions = ["sphinx_needs", "sphinxcontrib.plantuml"] +# note, the plantuml executable command is set globally in the test suite +plantuml_output_format = "svg" + needs_id_regex = "^[A-Za-z0-9_]*" needs_types = [ {"directive": "story", "title": "User Story", "prefix": "US_", "color": "#BFD8D2", "style": "node"}, @@ -31,8 +34,3 @@ def custom_func(): } needs_warnings_always_warn = True - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/doc_needs_warnings/conf.py b/tests/doc_test/doc_needs_warnings/conf.py index 0e1c50c45..f6b991773 100644 --- a/tests/doc_test/doc_needs_warnings/conf.py +++ b/tests/doc_test/doc_needs_warnings/conf.py @@ -1,5 +1,3 @@ -import os - extensions = ["sphinx_needs"] needs_table_style = "TABLE" @@ -11,11 +9,6 @@ {"directive": "test", "title": "Test Case", "prefix": "TC_", "color": "#DCB239", "style": "node"}, ] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" - needs_external_needs = [ {"base_url": "http://my_company.com/docs/v1/", "json_path": "needs_test_small.json", "id_prefix": "ext_"} ] diff --git a/tests/doc_test/doc_needs_warnings_return_status_code/conf.py b/tests/doc_test/doc_needs_warnings_return_status_code/conf.py index 3f9415d79..490cb7534 100644 --- a/tests/doc_test/doc_needs_warnings_return_status_code/conf.py +++ b/tests/doc_test/doc_needs_warnings_return_status_code/conf.py @@ -1,5 +1,3 @@ -import os - extensions = ["sphinx_needs"] needs_table_style = "TABLE" @@ -11,11 +9,6 @@ {"directive": "test", "title": "Test Case", "prefix": "TC_", "color": "#DCB239", "style": "node"}, ] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" - def my_custom_warning_check(need, log): if need["status"] == "open": diff --git a/tests/doc_test/doc_needsfile/conf.py b/tests/doc_test/doc_needsfile/conf.py index d3d4bf6ef..e607e1f34 100644 --- a/tests/doc_test/doc_needsfile/conf.py +++ b/tests/doc_test/doc_needsfile/conf.py @@ -1,5 +1,3 @@ -import os - extensions = ["sphinx_needs"] needs_file = "needs_errors.json" @@ -10,8 +8,3 @@ {"directive": "impl", "title": "Implementation", "prefix": "IM_", "color": "#DF744A", "style": "node"}, {"directive": "test", "title": "Test Case", "prefix": "TC_", "color": "#DCB239", "style": "node"}, ] - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/doc_needtable/conf.py b/tests/doc_test/doc_needtable/conf.py index 4cf02a484..585e4438d 100644 --- a/tests/doc_test/doc_needtable/conf.py +++ b/tests/doc_test/doc_needtable/conf.py @@ -1,5 +1,3 @@ -import os - extensions = ["sphinx_needs"] needs_table_style = "TABLE" @@ -41,8 +39,3 @@ "options": ["github"], }, } - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/doc_needuml/conf.py b/tests/doc_test/doc_needuml/conf.py index 646739a08..1666acffc 100644 --- a/tests/doc_test/doc_needuml/conf.py +++ b/tests/doc_test/doc_needuml/conf.py @@ -1,7 +1,8 @@ -import os - extensions = ["sphinx_needs", "sphinxcontrib.plantuml"] +# note, the plantuml executable command is set globally in the test suite +plantuml_output_format = "svg" + needs_table_style = "TABLE" needs_types = [ @@ -35,8 +36,3 @@ {"directive": "impl", "title": "Implementation", "prefix": "IM_", "color": "#DF744A", "style": "node"}, {"directive": "test", "title": "Test Case", "prefix": "TC_", "color": "#DCB239", "style": "node"}, ] - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/doc_needuml_diagram_allowmixing/conf.py b/tests/doc_test/doc_needuml_diagram_allowmixing/conf.py index 646739a08..1666acffc 100644 --- a/tests/doc_test/doc_needuml_diagram_allowmixing/conf.py +++ b/tests/doc_test/doc_needuml_diagram_allowmixing/conf.py @@ -1,7 +1,8 @@ -import os - extensions = ["sphinx_needs", "sphinxcontrib.plantuml"] +# note, the plantuml executable command is set globally in the test suite +plantuml_output_format = "svg" + needs_table_style = "TABLE" needs_types = [ @@ -35,8 +36,3 @@ {"directive": "impl", "title": "Implementation", "prefix": "IM_", "color": "#DF744A", "style": "node"}, {"directive": "test", "title": "Test Case", "prefix": "TC_", "color": "#DCB239", "style": "node"}, ] - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/doc_needuml_duplicate_key/conf.py b/tests/doc_test/doc_needuml_duplicate_key/conf.py index 646739a08..1666acffc 100644 --- a/tests/doc_test/doc_needuml_duplicate_key/conf.py +++ b/tests/doc_test/doc_needuml_duplicate_key/conf.py @@ -1,7 +1,8 @@ -import os - extensions = ["sphinx_needs", "sphinxcontrib.plantuml"] +# note, the plantuml executable command is set globally in the test suite +plantuml_output_format = "svg" + needs_table_style = "TABLE" needs_types = [ @@ -35,8 +36,3 @@ {"directive": "impl", "title": "Implementation", "prefix": "IM_", "color": "#DF744A", "style": "node"}, {"directive": "test", "title": "Test Case", "prefix": "TC_", "color": "#DCB239", "style": "node"}, ] - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/doc_needuml_filter/conf.py b/tests/doc_test/doc_needuml_filter/conf.py index 646739a08..1666acffc 100644 --- a/tests/doc_test/doc_needuml_filter/conf.py +++ b/tests/doc_test/doc_needuml_filter/conf.py @@ -1,7 +1,8 @@ -import os - extensions = ["sphinx_needs", "sphinxcontrib.plantuml"] +# note, the plantuml executable command is set globally in the test suite +plantuml_output_format = "svg" + needs_table_style = "TABLE" needs_types = [ @@ -35,8 +36,3 @@ {"directive": "impl", "title": "Implementation", "prefix": "IM_", "color": "#DF744A", "style": "node"}, {"directive": "test", "title": "Test Case", "prefix": "TC_", "color": "#DCB239", "style": "node"}, ] - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/doc_needuml_jinja_func_flow/conf.py b/tests/doc_test/doc_needuml_jinja_func_flow/conf.py index 646739a08..1666acffc 100644 --- a/tests/doc_test/doc_needuml_jinja_func_flow/conf.py +++ b/tests/doc_test/doc_needuml_jinja_func_flow/conf.py @@ -1,7 +1,8 @@ -import os - extensions = ["sphinx_needs", "sphinxcontrib.plantuml"] +# note, the plantuml executable command is set globally in the test suite +plantuml_output_format = "svg" + needs_table_style = "TABLE" needs_types = [ @@ -35,8 +36,3 @@ {"directive": "impl", "title": "Implementation", "prefix": "IM_", "color": "#DF744A", "style": "node"}, {"directive": "test", "title": "Test Case", "prefix": "TC_", "color": "#DCB239", "style": "node"}, ] - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/doc_needuml_jinja_func_import_negative_tests/conf.py b/tests/doc_test/doc_needuml_jinja_func_import_negative_tests/conf.py index 1ddbd80a9..dfccf97c2 100644 --- a/tests/doc_test/doc_needuml_jinja_func_import_negative_tests/conf.py +++ b/tests/doc_test/doc_needuml_jinja_func_import_negative_tests/conf.py @@ -1,7 +1,8 @@ -import os - extensions = ["sphinx_needs", "sphinxcontrib.plantuml"] +# note, the plantuml executable command is set globally in the test suite +plantuml_output_format = "svg" + needs_types = [ { "directive": "int", @@ -34,11 +35,6 @@ {"directive": "test", "title": "Test Case", "prefix": "TC_", "color": "#DCB239", "style": "node"}, ] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" - needs_extra_links = [ { "option": "uses", diff --git a/tests/doc_test/doc_needuml_jinja_func_need_removed/conf.py b/tests/doc_test/doc_needuml_jinja_func_need_removed/conf.py index 646739a08..1666acffc 100644 --- a/tests/doc_test/doc_needuml_jinja_func_need_removed/conf.py +++ b/tests/doc_test/doc_needuml_jinja_func_need_removed/conf.py @@ -1,7 +1,8 @@ -import os - extensions = ["sphinx_needs", "sphinxcontrib.plantuml"] +# note, the plantuml executable command is set globally in the test suite +plantuml_output_format = "svg" + needs_table_style = "TABLE" needs_types = [ @@ -35,8 +36,3 @@ {"directive": "impl", "title": "Implementation", "prefix": "IM_", "color": "#DF744A", "style": "node"}, {"directive": "test", "title": "Test Case", "prefix": "TC_", "color": "#DCB239", "style": "node"}, ] - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/doc_needuml_jinja_func_ref/conf.py b/tests/doc_test/doc_needuml_jinja_func_ref/conf.py index 646739a08..1666acffc 100644 --- a/tests/doc_test/doc_needuml_jinja_func_ref/conf.py +++ b/tests/doc_test/doc_needuml_jinja_func_ref/conf.py @@ -1,7 +1,8 @@ -import os - extensions = ["sphinx_needs", "sphinxcontrib.plantuml"] +# note, the plantuml executable command is set globally in the test suite +plantuml_output_format = "svg" + needs_table_style = "TABLE" needs_types = [ @@ -35,8 +36,3 @@ {"directive": "impl", "title": "Implementation", "prefix": "IM_", "color": "#DF744A", "style": "node"}, {"directive": "test", "title": "Test Case", "prefix": "TC_", "color": "#DCB239", "style": "node"}, ] - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/doc_needuml_key_name_diagram/conf.py b/tests/doc_test/doc_needuml_key_name_diagram/conf.py index 646739a08..1666acffc 100644 --- a/tests/doc_test/doc_needuml_key_name_diagram/conf.py +++ b/tests/doc_test/doc_needuml_key_name_diagram/conf.py @@ -1,7 +1,8 @@ -import os - extensions = ["sphinx_needs", "sphinxcontrib.plantuml"] +# note, the plantuml executable command is set globally in the test suite +plantuml_output_format = "svg" + needs_table_style = "TABLE" needs_types = [ @@ -35,8 +36,3 @@ {"directive": "impl", "title": "Implementation", "prefix": "IM_", "color": "#DF744A", "style": "node"}, {"directive": "test", "title": "Test Case", "prefix": "TC_", "color": "#DCB239", "style": "node"}, ] - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/doc_needuml_save/conf.py b/tests/doc_test/doc_needuml_save/conf.py index 3b01b0e60..e4c6437fd 100644 --- a/tests/doc_test/doc_needuml_save/conf.py +++ b/tests/doc_test/doc_needuml_save/conf.py @@ -1,7 +1,8 @@ -import os - extensions = ["sphinx_needs", "sphinxcontrib.plantuml"] +# note, the plantuml executable command is set globally in the test suite +plantuml_output_format = "svg" + needs_table_style = "TABLE" needs_types = [ @@ -36,9 +37,4 @@ {"directive": "test", "title": "Test Case", "prefix": "TC_", "color": "#DCB239", "style": "node"}, ] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" - needs_build_needumls = "my_needumls" diff --git a/tests/doc_test/doc_needuml_save_with_abs_path/conf.py b/tests/doc_test/doc_needuml_save_with_abs_path/conf.py index 646739a08..1666acffc 100644 --- a/tests/doc_test/doc_needuml_save_with_abs_path/conf.py +++ b/tests/doc_test/doc_needuml_save_with_abs_path/conf.py @@ -1,7 +1,8 @@ -import os - extensions = ["sphinx_needs", "sphinxcontrib.plantuml"] +# note, the plantuml executable command is set globally in the test suite +plantuml_output_format = "svg" + needs_table_style = "TABLE" needs_types = [ @@ -35,8 +36,3 @@ {"directive": "impl", "title": "Implementation", "prefix": "IM_", "color": "#DF744A", "style": "node"}, {"directive": "test", "title": "Test Case", "prefix": "TC_", "color": "#DCB239", "style": "node"}, ] - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/doc_open_needs_service/conf.py b/tests/doc_test/doc_open_needs_service/conf.py index 9d5f42fd3..be86e0012 100644 --- a/tests/doc_test/doc_open_needs_service/conf.py +++ b/tests/doc_test/doc_open_needs_service/conf.py @@ -29,9 +29,3 @@ }, }, } - - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/doc_report_dead_links_false/conf.py b/tests/doc_test/doc_report_dead_links_false/conf.py index a2d0203e1..3e75ba02f 100644 --- a/tests/doc_test/doc_report_dead_links_false/conf.py +++ b/tests/doc_test/doc_report_dead_links_false/conf.py @@ -1,7 +1,8 @@ -import os - extensions = ["sphinx_needs", "sphinxcontrib.plantuml"] +# note, the plantuml executable command is set globally in the test suite +plantuml_output_format = "svg" + needs_types = [ {"directive": "story", "title": "User Story", "prefix": "US_", "color": "#BFD8D2", "style": "node"}, {"directive": "spec", "title": "Specification", "prefix": "SP_", "color": "#FEDCD2", "style": "node"}, @@ -29,8 +30,3 @@ "style_part": "dotted,#00AA00", }, ] - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/doc_report_dead_links_true/conf.py b/tests/doc_test/doc_report_dead_links_true/conf.py index c48c0e9db..91467f963 100644 --- a/tests/doc_test/doc_report_dead_links_true/conf.py +++ b/tests/doc_test/doc_report_dead_links_true/conf.py @@ -1,7 +1,8 @@ -import os - extensions = ["sphinx_needs", "sphinxcontrib.plantuml"] +# note, the plantuml executable command is set globally in the test suite +plantuml_output_format = "svg" + needs_types = [ {"directive": "story", "title": "User Story", "prefix": "US_", "color": "#BFD8D2", "style": "node"}, {"directive": "spec", "title": "Specification", "prefix": "SP_", "color": "#FEDCD2", "style": "node"}, @@ -27,8 +28,3 @@ "style_part": "dotted,#00AA00", }, ] - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/doc_role_need_max_title_length/conf.py b/tests/doc_test/doc_role_need_max_title_length/conf.py index 1c27fc5e7..46b0b1685 100644 --- a/tests/doc_test/doc_role_need_max_title_length/conf.py +++ b/tests/doc_test/doc_role_need_max_title_length/conf.py @@ -1,5 +1,3 @@ -import os - extensions = ["sphinx_needs"] needs_types = [ @@ -12,8 +10,3 @@ needs_role_need_template = "[{id}] {title} ({status}) {type_name}/{type} - {tags} - {links} - {links_back} - {content}" needs_role_need_max_title_length = 10 - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/doc_role_need_max_title_length_unlimited/conf.py b/tests/doc_test/doc_role_need_max_title_length_unlimited/conf.py index a72bc09e9..23dec017c 100644 --- a/tests/doc_test/doc_role_need_max_title_length_unlimited/conf.py +++ b/tests/doc_test/doc_role_need_max_title_length_unlimited/conf.py @@ -1,5 +1,3 @@ -import os - extensions = ["sphinx_needs"] needs_types = [ @@ -12,8 +10,3 @@ needs_role_need_template = "[{id}] {title} ({status}) {type_name}/{type} - {tags} - {links} - {links_back} - {content}" needs_role_need_max_title_length = -1 - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/doc_role_need_template/conf.py b/tests/doc_test/doc_role_need_template/conf.py index da01d5bc9..4d15bdb0d 100644 --- a/tests/doc_test/doc_role_need_template/conf.py +++ b/tests/doc_test/doc_role_need_template/conf.py @@ -1,5 +1,3 @@ -import os - extensions = ["sphinx_needs"] needs_types = [ @@ -10,8 +8,3 @@ ] needs_role_need_template = "[{id}] {title} ({status}) {type_name}/{type} - {tags} - {links} - {links_back} - {content}" - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/doc_style_blank/conf.py b/tests/doc_test/doc_style_blank/conf.py index 86cb5f045..ef8a46842 100644 --- a/tests/doc_test/doc_style_blank/conf.py +++ b/tests/doc_test/doc_style_blank/conf.py @@ -1,5 +1,3 @@ -import os - extensions = ["sphinx_needs"] needs_types = [ @@ -10,8 +8,3 @@ ] needs_css = "blank.css" - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/doc_style_custom/conf.py b/tests/doc_test/doc_style_custom/conf.py index bf781778e..80485dc17 100644 --- a/tests/doc_test/doc_style_custom/conf.py +++ b/tests/doc_test/doc_style_custom/conf.py @@ -10,8 +10,3 @@ ] needs_css = os.path.join(os.path.dirname(__file__), "my_custom.css") - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/doc_style_modern/conf.py b/tests/doc_test/doc_style_modern/conf.py index 8552cb40d..68f00c54c 100644 --- a/tests/doc_test/doc_style_modern/conf.py +++ b/tests/doc_test/doc_style_modern/conf.py @@ -1,5 +1,3 @@ -import os - extensions = ["sphinx_needs"] needs_types = [ @@ -10,8 +8,3 @@ ] needs_css = "modern.css" - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/doc_style_unknown/conf.py b/tests/doc_test/doc_style_unknown/conf.py index dc15b11c0..ec0cfafe9 100644 --- a/tests/doc_test/doc_style_unknown/conf.py +++ b/tests/doc_test/doc_style_unknown/conf.py @@ -1,5 +1,3 @@ -import os - extensions = ["sphinx_needs"] needs_types = [ @@ -10,8 +8,3 @@ ] needs_css = "UNKNOWN.css" - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/external_doc/conf.py b/tests/doc_test/external_doc/conf.py index ef512823c..e38367471 100644 --- a/tests/doc_test/external_doc/conf.py +++ b/tests/doc_test/external_doc/conf.py @@ -4,6 +4,9 @@ extensions = ["sphinxcontrib.plantuml", "sphinx_needs"] +# note, the plantuml executable command is set globally in the test suite +plantuml_output_format = "svg" + needs_id_regex = "^[A-Za-z0-9_]" needs_types = [ @@ -25,8 +28,3 @@ # Needed to export really ALL needs. The default entry would filter out all needs coming from external needs_builder_filter = "True" - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/extra_options/conf.py b/tests/doc_test/extra_options/conf.py index 6e47f549a..7518f91ca 100644 --- a/tests/doc_test/extra_options/conf.py +++ b/tests/doc_test/extra_options/conf.py @@ -1,14 +1,7 @@ -import os - from docutils.parsers.rst import directives extensions = ["sphinx_needs"] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" - needs_extra_options = { "introduced": directives.unchanged, "updated": directives.unchanged, diff --git a/tests/doc_test/filter_doc/conf.py b/tests/doc_test/filter_doc/conf.py index 772b08f5a..ffcff9833 100644 --- a/tests/doc_test/filter_doc/conf.py +++ b/tests/doc_test/filter_doc/conf.py @@ -1,5 +1,3 @@ -import os - extensions = ["sphinx_needs"] needs_id_regex = "^[A-Za-z0-9_]" @@ -11,8 +9,3 @@ {"directive": "impl", "title": "Implementation", "prefix": "IM_", "color": "#DF744A", "style": "node"}, {"directive": "test", "title": "Test Case", "prefix": "TC_", "color": "#DCB239", "style": "node"}, ] - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/generic_doc/conf.py b/tests/doc_test/generic_doc/conf.py index 7974f2989..21eab6d52 100644 --- a/tests/doc_test/generic_doc/conf.py +++ b/tests/doc_test/generic_doc/conf.py @@ -1,5 +1,3 @@ -import os - extensions = ["sphinx_needs"] needs_types = [ @@ -8,8 +6,3 @@ {"directive": "impl", "title": "Implementation", "prefix": "IM_", "color": "#DF744A", "style": "node"}, {"directive": "test", "title": "Test Case", "prefix": "TC_", "color": "#DCB239", "style": "node"}, ] - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/import_doc/conf.py b/tests/doc_test/import_doc/conf.py index ffa0fe223..fcbde4dd9 100644 --- a/tests/doc_test/import_doc/conf.py +++ b/tests/doc_test/import_doc/conf.py @@ -1,5 +1,3 @@ -import os - version = "1.0" extensions = ["sphinx_needs"] @@ -32,8 +30,3 @@ {% endif -%} """ - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/import_doc_empty/conf.py b/tests/doc_test/import_doc_empty/conf.py index 5351ffb08..45270f660 100644 --- a/tests/doc_test/import_doc_empty/conf.py +++ b/tests/doc_test/import_doc_empty/conf.py @@ -1,5 +1,3 @@ -import os - extensions = ["sphinx_needs"] needs_id_regex = "^[A-Za-z0-9_]" @@ -30,8 +28,3 @@ {% endif -%} """ - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/import_doc_invalid/conf.py b/tests/doc_test/import_doc_invalid/conf.py index 5351ffb08..45270f660 100644 --- a/tests/doc_test/import_doc_invalid/conf.py +++ b/tests/doc_test/import_doc_invalid/conf.py @@ -1,5 +1,3 @@ -import os - extensions = ["sphinx_needs"] needs_id_regex = "^[A-Za-z0-9_]" @@ -30,8 +28,3 @@ {% endif -%} """ - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/multiple_link_backs/conf.py b/tests/doc_test/multiple_link_backs/conf.py index 8a9332c49..64873d961 100644 --- a/tests/doc_test/multiple_link_backs/conf.py +++ b/tests/doc_test/multiple_link_backs/conf.py @@ -1,8 +1 @@ -import os - extensions = ["sphinx_needs"] - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/need_constraints/conf.py b/tests/doc_test/need_constraints/conf.py index acbee6adf..b33483a78 100644 --- a/tests/doc_test/need_constraints/conf.py +++ b/tests/doc_test/need_constraints/conf.py @@ -1,5 +1,3 @@ -import os - extensions = ["sphinx_needs"] needs_build_json = True @@ -12,11 +10,6 @@ {"directive": "test", "title": "Test Case", "prefix": "TC_", "color": "#DCB239", "style": "node"}, ] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" - needs_external_needs = [ {"base_url": "http://my_company.com/docs/v1/", "json_path": "needs_test_small.json", "id_prefix": "ext_"} ] diff --git a/tests/doc_test/need_constraints_failed/conf.py b/tests/doc_test/need_constraints_failed/conf.py index e9f872cec..31228134f 100644 --- a/tests/doc_test/need_constraints_failed/conf.py +++ b/tests/doc_test/need_constraints_failed/conf.py @@ -1,5 +1,3 @@ -import os - extensions = ["sphinx_needs"] needs_table_style = "TABLE" @@ -11,11 +9,6 @@ {"directive": "test", "title": "Test Case", "prefix": "TC_", "color": "#DCB239", "style": "node"}, ] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "../need_constraints", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" - needs_external_needs = [ {"base_url": "http://my_company.com/docs/v1/", "json_path": "needs_test_small.json", "id_prefix": "ext_"} ] diff --git a/tests/doc_test/needextract_with_nested_needs/conf.py b/tests/doc_test/needextract_with_nested_needs/conf.py index 440f78616..df3fe57f8 100644 --- a/tests/doc_test/needextract_with_nested_needs/conf.py +++ b/tests/doc_test/needextract_with_nested_needs/conf.py @@ -1,5 +1,3 @@ -import os - extensions = ["sphinx_needs"] needs_id_regex = "^[A-Za-z0-9_]" @@ -10,8 +8,3 @@ {"directive": "impl", "title": "Implementation", "prefix": "IM_", "color": "#DF744A", "style": "node"}, {"directive": "test", "title": "Test Case", "prefix": "TC_", "color": "#DCB239", "style": "node"}, ] - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/needpie_with_zero_needs/conf.py b/tests/doc_test/needpie_with_zero_needs/conf.py index 440f78616..df3fe57f8 100644 --- a/tests/doc_test/needpie_with_zero_needs/conf.py +++ b/tests/doc_test/needpie_with_zero_needs/conf.py @@ -1,5 +1,3 @@ -import os - extensions = ["sphinx_needs"] needs_id_regex = "^[A-Za-z0-9_]" @@ -10,8 +8,3 @@ {"directive": "impl", "title": "Implementation", "prefix": "IM_", "color": "#DF744A", "style": "node"}, {"directive": "test", "title": "Test Case", "prefix": "TC_", "color": "#DCB239", "style": "node"}, ] - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/non_exists_file_import/conf.py b/tests/doc_test/non_exists_file_import/conf.py index 5351ffb08..45270f660 100644 --- a/tests/doc_test/non_exists_file_import/conf.py +++ b/tests/doc_test/non_exists_file_import/conf.py @@ -1,5 +1,3 @@ -import os - extensions = ["sphinx_needs"] needs_id_regex = "^[A-Za-z0-9_]" @@ -30,8 +28,3 @@ {% endif -%} """ - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/parallel_doc/conf.py b/tests/doc_test/parallel_doc/conf.py index 07468f5ae..03f708826 100644 --- a/tests/doc_test/parallel_doc/conf.py +++ b/tests/doc_test/parallel_doc/conf.py @@ -1,5 +1,3 @@ -import os - extensions = ["sphinx_needs"] needs_types = [ @@ -12,7 +10,3 @@ needs_variant_options = ["status", "author"] needs_filter_data = {"assignee": "Randy Duodu"} needs_extra_options = ["my_extra_option", "another_option", "author", "comment"] -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/role_need_doc/conf.py b/tests/doc_test/role_need_doc/conf.py index 56fbf76ab..a3d0a4e67 100644 --- a/tests/doc_test/role_need_doc/conf.py +++ b/tests/doc_test/role_need_doc/conf.py @@ -2,6 +2,9 @@ extensions = ["sphinxcontrib.plantuml", "sphinx_needs"] +# note, the plantuml executable command is set globally in the test suite +plantuml_output_format = "svg" + needs_id_regex = "^[A-Za-z0-9_]" needs_types = [ @@ -23,8 +26,3 @@ # Needed to export really ALL needs. The default entry would filter out all needs coming from external needs_builder_filter = "True" - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/service_doc/conf.py b/tests/doc_test/service_doc/conf.py index d423705ac..b2a23705d 100644 --- a/tests/doc_test/service_doc/conf.py +++ b/tests/doc_test/service_doc/conf.py @@ -1,5 +1,3 @@ -import os - from tests.test_services.test_service_basics import NoDebugService, ServiceTest extensions = ["sphinx_needs"] @@ -27,9 +25,3 @@ }, }, } - - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/title_from_content/conf.py b/tests/doc_test/title_from_content/conf.py index 61c73ebb9..8b1a4a0c3 100644 --- a/tests/doc_test/title_from_content/conf.py +++ b/tests/doc_test/title_from_content/conf.py @@ -1,11 +1,4 @@ -import os - extensions = ["sphinx_needs"] needs_title_from_content = True needs_max_title_length = 50 smartquotes_action = "qD" - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/title_optional/conf.py b/tests/doc_test/title_optional/conf.py index 275d23e75..cdc89c774 100644 --- a/tests/doc_test/title_optional/conf.py +++ b/tests/doc_test/title_optional/conf.py @@ -1,11 +1,4 @@ -import os - extensions = ["sphinx_needs"] needs_title_optional = True needs_max_title_length = 50 smartquotes_action = "qD" - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/unicode_support/conf.py b/tests/doc_test/unicode_support/conf.py index 6c0a46f6b..885bd47d6 100644 --- a/tests/doc_test/unicode_support/conf.py +++ b/tests/doc_test/unicode_support/conf.py @@ -1,5 +1,3 @@ -import os - extensions = ["sphinx_needs"] needs_table_style = "TABLE" @@ -10,8 +8,3 @@ {"directive": "impl", "title": "Implementation", "prefix": "IM_", "color": "#DF744A", "style": "node"}, {"directive": "test", "title": "Test Case", "prefix": "TC_", "color": "#DCB239", "style": "node"}, ] - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/variant_doc/conf.py b/tests/doc_test/variant_doc/conf.py index 85c4de687..d94dd50ed 100644 --- a/tests/doc_test/variant_doc/conf.py +++ b/tests/doc_test/variant_doc/conf.py @@ -1,9 +1,10 @@ -import os - tags.add("tag_b") # noqa: F821 extensions = ["sphinx_needs", "sphinxcontrib.plantuml"] +# note, the plantuml executable command is set globally in the test suite +plantuml_output_format = "svg" + needs_id_regex = "^[A-Za-z0-9_]" needs_types = [ @@ -28,9 +29,3 @@ "value", "unit", ] - - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg" diff --git a/tests/doc_test/variant_options/conf.py b/tests/doc_test/variant_options/conf.py index 44943a950..42108d4a1 100644 --- a/tests/doc_test/variant_options/conf.py +++ b/tests/doc_test/variant_options/conf.py @@ -1,9 +1,10 @@ -import os - tags.add("tag_b") # noqa: F821 extensions = ["sphinx_needs", "sphinxcontrib.plantuml"] +# note, the plantuml executable command is set globally in the test suite +plantuml_output_format = "svg" + needs_id_regex = "^[A-Za-z0-9_]" needs_types = [ @@ -28,8 +29,3 @@ "value", "unit", ] - -plantuml = "java -Djava.awt.headless=true -jar %s" % os.path.join( - os.path.dirname(__file__), "..", "utils", "plantuml.jar" -) -plantuml_output_format = "svg"