Merge branch 'main' into feat/toolkit_installer

ansys · May 3, 2024 · 554d9a0 · 554d9a0
2 parents 6cb453d + 9c4ba60
commit 554d9a0
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 49 deletions.
diff --git a/_unittest_solvers/test_00_analyze.py b/_unittest_solvers/test_00_analyze.py
@@ -431,7 +431,7 @@ def test_07_export_maxwell_fields(self, m3dtransient):
         new_setup.props = setup.props
         new_setup.update()
 
-    @pytest.mark.skipif(is_linux and desktop_version == "2024.2", reason="Temporary skip for SPISIM related tests")
+    @pytest.mark.skipif(is_linux and desktop_version == "2024.1", reason="Temporary skip for SPISIM related tests")
     def test_08_compute_erl(self, circuit_erl):
         touchstone_file = circuit_erl.export_touchstone()
         spisim = SpiSim(touchstone_file)
@@ -453,7 +453,7 @@ def test_08_compute_erl(self, circuit_erl):
         erl_data_3 = spisim.compute_erl(specify_through_ports=[1, 2, 3, 4])
         assert erl_data_3
 
-    @pytest.mark.skipif(is_linux and desktop_version == "2024.2", reason="Temporary skip for SPISIM related tests")
+    @pytest.mark.skipif(is_linux and desktop_version == "2024.1", reason="Temporary skip for SPISIM related tests")
     def test_09a_compute_com(self, local_scratch, circuit_com):
         touchstone_file = circuit_com.export_touchstone()
         spisim = SpiSim(touchstone_file)
@@ -466,7 +466,7 @@ def test_09a_compute_com(self, local_scratch, circuit_com):
         )
         assert com
 
-    @pytest.mark.skipif(is_linux and desktop_version == "2024.2", reason="Temporary skip for SPISIM related tests")
+    @pytest.mark.skipif(is_linux and desktop_version == "2024.1", reason="Temporary skip for SPISIM related tests")
     def test_09b_compute_com(self, local_scratch):
         com_example_file_folder = os.path.join(local_path, "example_models", test_subfolder, "com_unit_test_sparam")
         thru_s4p = local_scratch.copyfile(os.path.join(com_example_file_folder, "SerDes_Demo_02_Thru.s4p"))
@@ -506,7 +506,7 @@ def test_09b_compute_com(self, local_scratch):
         )
         assert com_0 and com_1
 
-    @pytest.mark.skipif(is_linux and desktop_version == "2024.2", reason="Temporary skip for SPISIM related tests")
+    @pytest.mark.skipif(is_linux and desktop_version == "2024.1", reason="Temporary skip for SPISIM related tests")
     def test_09c_compute_com(self, local_scratch):
         com_example_file_folder = Path(local_path) / "example_models" / test_subfolder / "com_unit_test_sparam"
         thru_s4p = local_scratch.copyfile(com_example_file_folder / "SerDes_Demo_02_Thru.s4p")

diff --git a/doc/source/conf.py b/doc/source/conf.py
@@ -129,7 +129,6 @@ def setup(app):
     "sphinx.ext.coverage",
     "sphinx_copybutton",
     "sphinx_design",
-    "sphinx_jinja",
     "sphinx.ext.graphviz",
     "sphinx.ext.mathjax",
     "sphinx.ext.inheritance_diagram",
@@ -296,24 +295,6 @@ def setup(app):
             #                         "set_plot_theme('document')"),
         }
 
-jinja_contexts = {
-    "main_toctree": {
-        "run_examples": config["run_examples"],
-    },
-}
-# def prepare_jinja_env(jinja_env) -> None:
-#     """
-#     Customize the jinja env.
-#
-#     Notes
-#     -----
-#     See https://jinja.palletsprojects.com/en/3.0.x/api/#jinja2.Environment
-#     """
-#     jinja_env.globals["project_name"] = project
-#
-#
-# autoapi_prepare_jinja_env = prepare_jinja_env
-
 # -- Options for HTML output -------------------------------------------------
 html_short_title = html_title = "PyAEDT"
 html_theme = "ansys_sphinx_theme"

diff --git a/doc/source/index.rst b/doc/source/index.rst
@@ -37,33 +37,24 @@ enabling straightforward and efficient automation in your workflow.
         This section contains descriptions of the functions and modules included in PyAEDT.
         It describes how the methods work and the parameters that can be used.
 
-.. jinja:: main_toctree
-
-   .. grid:: 2
-
-      {% if run_examples %}
-      .. grid-item-card:: Examples :fa:`scroll`
-         :link: examples/index
-         :link-type: doc
+    .. grid-item-card:: Examples :fa:`scroll`
+        :link: examples/index
+        :link-type: doc
 
-         Explore examples that show how to use PyAEDT to perform different types of simulations.
-
-      {% endif %}
+        Explore examples that show how to use PyAEDT to perform different types of simulations.
 
-      .. grid-item-card:: Contribute :fa:`people-group`
-         :link: Getting_started/Contributing
-         :link-type: doc
+.. grid:: 2
 
-         Learn how to contribute to the PyAEDT codebase or documentation.
+    .. grid-item-card:: Contribute :fa:`people-group`
+        :link: Getting_started/Contributing
+        :link-type: doc
 
-.. jinja:: main_toctree
+        Learn how to contribute to the PyAEDT codebase or documentation.
 
-    .. toctree::
-       :hidden:
+.. toctree::
+    :hidden:
 
-       Getting_started/index
-       User_guide/index
-       API/index
-       {% if run_examples %}
-       examples/index
-       {% endif %}
+    Getting_started/index
+    User_guide/index
+    API/index
+    examples/index
diff --git a/pyproject.toml b/pyproject.toml
@@ -93,7 +93,6 @@ doc = [
     #"sphinx-autodoc-typehints",
     "sphinx-copybutton>=0.5.0,<0.6",
     "sphinx-gallery>=0.14.0,<0.17",
-    "sphinx-jinja>=2.0,<2.1",
     #"sphinx-notfound-page",
     "sphinx_design>=0.4.0,<0.6",
     #"sphinxcontrib-websupport",
@@ -118,7 +117,6 @@ doc-noexamples = [
     #"sphinx-notfound-page",
     #"sphinxcontrib-websupport",
     "sphinx_design>=0.4.0,<0.6",
-    "sphinx-jinja>=2.0,<2.1",
 ]
 all = [
     "imageio>=2.30.0,<2.35",