Merge pull request #78 from phobson/follow-linter

take the linter's advice

Author: phobson

check_probscale.py

@@ -1,13 +1,7 @@
 import sys
-import matplotlib
-
-matplotlib.use("agg")
-
-from matplotlib.pyplot import style
-
-style.use("classic")
 
 from probscale import tests
 
+
 status = tests.test(*sys.argv[1:])
 sys.exit(status)

probscale/tests/__init__.py

@@ -6,7 +6,7 @@
 def test(*args):
     try:
         import pytest
-    except ImportError as e:
+    except ImportError:
         raise ImportError("`pytest` is required to run the test suite")
 
     options = [resource_filename("probscale", "tests")]

probscale/tests/test_formatters.py

@@ -1,7 +1,6 @@
 import numpy
 
 import pytest
-import numpy.testing as nptest
 
 from probscale import formatters
 

probscale/tests/test_probscale.py

@@ -1,12 +1,11 @@
 import os
-import sys
 
 import numpy
 import matplotlib.pyplot as plt
 
 try:
     from scipy import stats
-except:  # pragma: no cover
+except ImportError:  # pragma: no cover
     stats = None
 
 import pytest
@@ -127,7 +126,7 @@ def test_sign_with_nan_no_warning(mn):
     assert numpy.isnan(res)
 
 
-def test_sign_with_nan_no_warning(mn):
+def test_sign_with_nan_no_warning_inv(mn):
     with pytest.warns(None) as record:
         res = mn._approx_inv_erf(numpy.nan)
     assert not record

probscale/tests/test_validate.py

@@ -43,7 +43,7 @@ def test_fit_arguments_valid(which, kwarg):
     assert result == which
 
 
-@pytest.mark.parametrize(("kwarg",), [("fitprobs",), ("fitlogs",),])
+@pytest.mark.parametrize("kwarg", ["fitprobs", "fitlogs"])
 def test_fit_arguments_invalid(kwarg):
     with pytest.raises(ValueError):
         validate.fit_argument("junk", kwarg)

probscale/tests/test_viz.py

@@ -1,18 +1,15 @@
-import sys
-from functools import wraps
-
 import numpy
 import matplotlib.lines
 import matplotlib.pyplot as plt
 
 try:
     from scipy import stats
-except:  # pragma: no cover
+except ImportError:  # pragma: no cover
     stats = None
 
 try:
     import seaborn
-except:  # pragma: no cover
+except ImportError:  # pragma: no cover
     seaborn = None
 
 from probscale import viz
@@ -1075,6 +1072,6 @@ def test_probplot_with_FacetGrid_with_markers(usemarkers):
     _lines = filter(
         lambda x: isinstance(x, matplotlib.lines.Line2D), fg.ax.get_children()
     )
-    result_markers = {l.get_label(): l.get_marker() for l in _lines}
+    result_markers = {line.get_label(): line.get_marker() for line in _lines}
     expected_markers = dict(zip(species, markers))
     assert expected_markers == result_markers

probscale/viz.py

@@ -1,7 +1,6 @@
 import copy
 
 import numpy
-from matplotlib import pyplot
 
 from .probscale import _minimal_norm
 from . import validate

setup.py

@@ -2,8 +2,6 @@
 #
 # Usage: python setup.py install
 
-
-import os
 from setuptools import setup, find_packages