CHORE: Update conftest to avoid 'ON_CI'

ansys · May 22, 2024 · 40e6e10 · 40e6e10
1 parent b3d9aa7
commit 40e6e10
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 16 deletions.
diff --git a/_unittest/conftest.py b/_unittest/conftest.py
@@ -27,6 +27,7 @@
 import tempfile
 import time
 
+import matplotlib
 import pytest
 
 from pyaedt.generic.settings import settings
@@ -219,3 +220,9 @@ def _method(project_name=None, subfolder=""):
         )
 
     return _method
+
+
+@pytest.fixture(autouse=True)
+def matplotlib_use_agg():
+    """Configure Matplotlib to use 'Agg' backend for all tests."""
+    matplotlib.use("Agg")
diff --git a/pyaedt/generic/plot.py b/pyaedt/generic/plot.py
@@ -36,12 +36,6 @@
     try:
         from matplotlib.patches import PathPatch
         from matplotlib.path import Path
-
-        # Use matplotlib Agg backend (non-interactive) when the CI is running.
-        if os.getenv("ON_CI", "False") == "True":  # pragma: no cover
-            import matplotlib
-
-            matplotlib.use("Agg")
         import matplotlib.pyplot as plt
 
         rc_params = {

diff --git a/pyaedt/generic/touchstone_parser.py b/pyaedt/generic/touchstone_parser.py
@@ -8,11 +8,6 @@
 from pyaedt.misc.misc import installed_versions
 
 if not is_ironpython:
-    # Use matplotlib Agg backend (non-interactive) when the CI is running.
-    if os.getenv("ON_CI", "False") == "True":  # pragma: no cover
-        import matplotlib
-
-        matplotlib.use("Agg")
     import matplotlib.pyplot as plt
     import numpy as np
     import skrf as rf

diff --git a/pyaedt/modules/solutions.py b/pyaedt/modules/solutions.py
@@ -45,11 +45,6 @@
     except ImportError:
         pv = None
     try:
-        # Use matplotlib Agg backend (non-interactive) when the CI is running.
-        if os.getenv("ON_CI", "False") == "True":  # pragma: no cover
-            import matplotlib
-
-            matplotlib.use("Agg")
         import matplotlib.pyplot as plt
     except ImportError:
         plt = None