Skip to content

Commit f0393b7

Browse files
committed
isort and autopep8 conftest.py
1 parent d4ee3be commit f0393b7

1 file changed

Lines changed: 4 additions & 3 deletions

File tree

control/tests/conftest.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
"""conftest.py - pytest local plugins and fixtures"""
22

3-
from contextlib import contextmanager
43
import os
54
import sys
5+
from contextlib import contextmanager
66

77
import matplotlib as mpl
88
import numpy as np
9-
import scipy as sp
109
import pytest
10+
import scipy as sp
1111

1212
import control
1313

@@ -38,6 +38,7 @@ def control_defaults():
3838
# assert that nothing changed it without reverting
3939
assert control.config.defaults == the_defaults
4040

41+
4142
@pytest.fixture(scope="function", autouse=TEST_MATRIX_AND_ARRAY,
4243
params=[pytest.param("arrayout", marks=matrixerrorfilter),
4344
pytest.param("matrixout", marks=matrixfilter)])
@@ -106,7 +107,7 @@ def editsdefaults():
106107
@pytest.fixture(scope="function")
107108
def mplcleanup():
108109
"""Clean up any plots and changes a test may have made to matplotlib.
109-
110+
110111
compare matplotlib.testing.decorators.cleanup() but as a fixture instead
111112
of a decorator.
112113
"""

0 commit comments

Comments
 (0)