Add pytest marker pandas for tests requiring pandas

Author: Rory Yorke

control/tests/conftest.py

@@ -20,6 +20,12 @@ def pytest_runtest_setup(item):
                 for mark in item.iter_markers())):
         pytest.skip("cvxopt not installed")
 
+    if (not control.exception.pandas_check()
+        and any(mark.name == 'pandas'
+                for mark in item.iter_markers())):
+        pytest.skip("pandas not installed")
+
+
 
 @pytest.fixture(scope="session", autouse=True)
 def control_defaults():

control/tests/frd_test.py

@@ -12,7 +12,6 @@
 from control.xferfcn import TransferFunction
 from control.frdata import frd, _convert_to_frd, FrequencyResponseData
 from control import bdalg, freqplot
-from control.exception import pandas_check
 
 
 class TestFRD:
@@ -820,7 +819,7 @@ def test_named_signals():
     assert f1.output_labels == ['y0']
 
 
-@pytest.mark.skipif(not pandas_check(), reason="pandas not installed")
+@pytest.mark.pandas
 def test_to_pandas():
     # Create a SISO frequency response
     h1 = TransferFunction([1], [1, 2, 2])

control/tests/timeresp_test.py

@@ -1235,7 +1235,7 @@ def test_response_transpose(
         assert x.shape == (T.size, sys.nstates)
 
 
-@pytest.mark.skipif(not pandas_check(), reason="pandas not installed")
+@pytest.mark.pandas
 def test_to_pandas():
     # Create a SISO time response
     sys = ct.rss(2, 1, 1)

pyproject.toml

@@ -58,6 +58,7 @@ filterwarnings = [
 markers = [
   "slycot: tests needing slycot",
   "cvxopt: tests needing cvxopt",
+  "pandas: tests needing pandas",
 ]