Remove unused imports

roryyorke · roryyorke · commit 2a1833171a3e · 2025-02-16T10:31:27.000+02:00
Where imports were test fixtures, replaced with
`@pytest.mark.usefixtures('nameoffixture')`.
diff --git a/control/tests/bspline_test.py b/control/tests/bspline_test.py
@@ -11,11 +11,9 @@
 
 import numpy as np
 import pytest
-import scipy as sp
 
 import control as ct
 import control.flatsys as fs
-import control.optimal as opt
 
 def test_bspline_basis():
     Tf = 10
diff --git a/control/tests/conftest.py b/control/tests/conftest.py
@@ -1,8 +1,5 @@
 """conftest.py - pytest local plugins, fixtures, marks and functions."""
 
-import os
-from contextlib import contextmanager
-
 import matplotlib as mpl
 import numpy as np
 import pytest
diff --git a/control/tests/frd_test.py b/control/tests/frd_test.py
@@ -3,8 +3,6 @@
 RvP, 4 Oct 2012
 """
 
-import sys as pysys
-
 import numpy as np
 import matplotlib.pyplot as plt
 import pytest
@@ -13,7 +11,7 @@
 from control.statesp import StateSpace
 from control.xferfcn import TransferFunction
 from control.frdata import frd, _convert_to_frd, FrequencyResponseData
-from control import bdalg, evalfr, freqplot
+from control import bdalg, freqplot
 from control.tests.conftest import slycotonly
 from control.exception import pandas_check
 
diff --git a/control/tests/freqplot_test.py b/control/tests/freqplot_test.py
@@ -8,7 +8,6 @@
 import pytest
 
 import control as ct
-from control.tests.conftest import editsdefaults, slycotonly
 
 pytestmark = pytest.mark.usefixtures("mplcleanup")
 
diff --git a/control/tests/interconnect_test.py b/control/tests/interconnect_test.py
@@ -15,7 +15,6 @@
 import pytest
 
 import numpy as np
-import scipy as sp
 import math
 
 import control as ct
diff --git a/control/tests/iosys_test.py b/control/tests/iosys_test.py
@@ -18,7 +18,6 @@
 
 import control as ct
 import control.flatsys as fs
-from control.tests.conftest import slycotonly
 
 class TestIOSys:
 
diff --git a/control/tests/kwargs_test.py b/control/tests/kwargs_test.py
@@ -13,7 +13,6 @@
 import inspect
 import warnings
 
-import matplotlib.pyplot as plt
 import pytest
 
 import control
diff --git a/control/tests/lti_test.py b/control/tests/lti_test.py
@@ -12,8 +12,6 @@
 from control.lti import LTI, bandwidth, damp, dcgain, evalfr, poles, zeros
 from control.tests.conftest import slycotonly
 
-from .conftest import editsdefaults
-
 
 class TestLTI:
     @pytest.mark.parametrize("fun, args", [
diff --git a/control/tests/matlab2_test.py b/control/tests/matlab2_test.py
@@ -16,7 +16,6 @@
 
 from control.matlab import ss, step, impulse, initial, lsim, dcgain, ss2tf
 from control.timeresp import _check_convert_array
-from control.tests.conftest import slycotonly
 
 
 class TestControlMatlab:
diff --git a/control/tests/modelsimp_test.py b/control/tests/modelsimp_test.py
@@ -3,7 +3,6 @@
 RMM, 30 Mar 2011 (based on TestModelSimp from v0.4a)
 """
 
-import math
 import warnings
 
 import numpy as np
diff --git a/control/tests/namedio_test.py b/control/tests/namedio_test.py
@@ -8,7 +8,6 @@
 created for that purpose.
 """
 
-import re
 from copy import copy
 import warnings
 
diff --git a/control/tests/phaseplot_test.py b/control/tests/phaseplot_test.py
@@ -19,7 +19,6 @@
 import control as ct
 import control.phaseplot as pp
 from control import phase_plot
-from control.tests.conftest import mplcleanup
 
 
 # Legacy tests
diff --git a/control/tests/rlocus_test.py b/control/tests/rlocus_test.py
@@ -161,7 +161,6 @@ def test_rlocus_default_wn(self):
         # that will take a long time to do the calculation (minutes).
         #
         import scipy as sp
-        import signal
 
         # Define a system that exhibits this behavior
         sys = ct.tf(*sp.signal.zpk2tf(
diff --git a/control/tests/statesp_test.py b/control/tests/statesp_test.py
@@ -8,7 +8,6 @@
 """
 
 import operator
-import platform
 
 import numpy as np
 import pytest
@@ -23,10 +22,7 @@
 from control.statesp import StateSpace, _convert_to_statespace, \
     _rss_generate, _statesp_defaults, drss, linfnorm, rss, ss, tf2ss
 from control.xferfcn import TransferFunction, ss2tf
-
-from .conftest import assert_tf_close_coeff, editsdefaults, \
-    ignore_future_warning, slycotonly
-
+from .conftest import assert_tf_close_coeff
 
 class TestStateSpace:
     """Tests for the StateSpace class."""
@@ -232,7 +228,7 @@ def test_zero_empty(self):
         sys = _convert_to_statespace(TransferFunction([1], [1, 2, 1]))
         np.testing.assert_array_equal(sys.zeros(), np.array([]))
 
-    @slycotonly
+    @pytest.mark.usefixtures("slycotonly")
     def test_zero_siso(self, sys222):
         """Evaluate the zeros of a SISO system."""
         # extract only first input / first output system of sys222. This system is denoted sys111
@@ -262,7 +258,7 @@ def test_zero_mimo_sys222_square(self, sys222):
         true_z = np.sort([-10.568501,   3.368501])
         np.testing.assert_array_almost_equal(z, true_z)
 
-    @slycotonly
+    @pytest.mark.usefixtures("slycotonly")
     def test_zero_mimo_sys623_non_square(self, sys623):
         """Evaluate the zeros of a non square MIMO system."""
 
@@ -409,7 +405,7 @@ def test_add_sub_mimo_siso(self):
                 ss2tf(result).minreal(),
             )
 
-    @slycotonly
+    @pytest.mark.usefixtures("slycotonly")
     @pytest.mark.parametrize(
         "left, right, expected",
         [
@@ -484,7 +480,7 @@ def test_mul_mimo_siso(self, left, right, expected):
             ss2tf(result).minreal(),
         )
 
-    @slycotonly
+    @pytest.mark.usefixtures("slycotonly")
     @pytest.mark.parametrize(
         "left, right, expected",
         [
@@ -559,7 +555,7 @@ def test_rmul_mimo_siso(self, left, right, expected):
             ss2tf(result).minreal(),
         )
 
-    @slycotonly
+    @pytest.mark.usefixtures("slycotonly")
     @pytest.mark.parametrize("power", [0, 1, 3, -3])
     @pytest.mark.parametrize("sysname", ["sys222", "sys322"])
     def test_pow(self, request, sysname, power):
@@ -578,7 +574,7 @@ def test_pow(self, request, sysname, power):
         np.testing.assert_allclose(expected.C, result.C)
         np.testing.assert_allclose(expected.D, result.D)
 
-    @slycotonly
+    @pytest.mark.usefixtures("slycotonly")
     @pytest.mark.parametrize("order", ["left", "right"])
     @pytest.mark.parametrize("sysname", ["sys121", "sys222", "sys322"])
     def test_pow_inv(self, request, sysname, order):
@@ -602,7 +598,7 @@ def test_pow_inv(self, request, sysname, order):
         # Check that the output is the same as the input
         np.testing.assert_allclose(R.outputs, U)
 
-    @slycotonly
+    @pytest.mark.usefixtures("slycotonly")
     def test_truediv(self, sys222, sys322):
         """Test state space truediv"""
         for sys in [sys222, sys322]:
@@ -621,7 +617,7 @@ def test_truediv(self, sys222, sys322):
                 ss2tf(result).minreal(),
             )
 
-    @slycotonly
+    @pytest.mark.usefixtures("slycotonly")
     def test_rtruediv(self, sys222, sys322):
         """Test state space rtruediv"""
         for sys in [sys222, sys322]:
@@ -722,7 +718,7 @@ def test_freq_resp(self):
             mag, phase, omega = sys.freqresp(true_omega)
             np.testing.assert_almost_equal(mag, true_mag)
 
-    @slycotonly
+    @pytest.mark.usefixtures("slycotonly")
     def test_minreal(self):
         """Test a minreal model reduction."""
         # A = [-2, 0.5, 0; 0.5, -0.3, 0; 0, 0, -0.1]
@@ -1516,25 +1512,22 @@ def dt_siso(self, request):
         name, systype, sysargs, dt, refgpeak, reffpeak = request.param
         return ct.c2d(systype(*sysargs), dt), refgpeak, reffpeak
 
-    @slycotonly
-    @pytest.mark.usefixtures('ignore_future_warning')
+    @pytest.mark.usefixtures('slycotonly', 'ignore_future_warning')
     def test_linfnorm_ct_siso(self, ct_siso):
         sys, refgpeak, reffpeak = ct_siso
         gpeak, fpeak = linfnorm(sys)
         np.testing.assert_allclose(gpeak, refgpeak)
         np.testing.assert_allclose(fpeak, reffpeak)
 
-    @slycotonly
-    @pytest.mark.usefixtures('ignore_future_warning')
+    @pytest.mark.usefixtures('slycotonly', 'ignore_future_warning')
     def test_linfnorm_dt_siso(self, dt_siso):
         sys, refgpeak, reffpeak = dt_siso
         gpeak, fpeak = linfnorm(sys)
         # c2d pole-mapping has round-off
         np.testing.assert_allclose(gpeak, refgpeak)
         np.testing.assert_allclose(fpeak, reffpeak)
 
-    @slycotonly
-    @pytest.mark.usefixtures('ignore_future_warning')
+    @pytest.mark.usefixtures('slycotonly', 'ignore_future_warning')
     def test_linfnorm_ct_mimo(self, ct_siso):
         siso, refgpeak, reffpeak = ct_siso
         sys = ct.append(siso, siso)
diff --git a/control/tests/stochsys_test.py b/control/tests/stochsys_test.py
@@ -6,7 +6,7 @@
 
 import control as ct
 import control.optimal as opt
-from control import lqe, dlqe, rss, drss, tf, ss, ControlArgument, slycot_check
+from control import lqe, dlqe, rss, tf, ControlArgument, slycot_check
 from math import log, pi
 
 # Utility function to check LQE answer
@@ -476,7 +476,6 @@ def test_indices(ctrl_indices, dist_indices):
     sysm = ct.ss(sys.A, sys.B[:, ctrl_idx], sys.C, sys.D[:, ctrl_idx])
 
     # Set the simulation time based on the slowest system pole
-    from math import log
     T = 10
 
     # Generate a system response with no disturbances
diff --git a/control/tests/timeplot_test.py b/control/tests/timeplot_test.py
@@ -7,8 +7,7 @@
 import pytest
 
 import control as ct
-from control.tests.conftest import mplcleanup, slycotonly
-
+from control.tests.conftest import slycotonly
 
 # Detailed test of (almost) all functionality
 #
diff --git a/control/tests/timeresp_test.py b/control/tests/timeresp_test.py
@@ -5,7 +5,6 @@
 
 import numpy as np
 import pytest
-import scipy as sp
 
 import control as ct
 from control import StateSpace, TransferFunction, c2d, isctime, ss2tf, tf2ss
