Fix code style issues

Author: astrofrog

pytest_mpl/plugin.py

@@ -63,7 +63,7 @@ def _download_file(baseline, filename):
         try:
             u = urlopen(base_url + filename)
             content = u.read()
-        except Exception as exc:
+        except Exception:
             warnings.warn('Downloading {0} failed'.format(base_url + filename))
         else:
             break
@@ -104,7 +104,9 @@ def pytest_addoption(parser):
 
 def pytest_configure(config):
 
-    config.addinivalue_line('markers', "mpl_image_compare: Compares matplotlib figures against a baseline image")
+    config.addinivalue_line('markers',
+                            "mpl_image_compare: Compares matplotlib figures "
+                            "against a baseline image")
 
     if config.getoption("--mpl") or config.getoption("--mpl-generate-path") is not None:
 
@@ -269,21 +271,26 @@ def item_function_wrapper(*args, **kwargs):
                     if baseline_remote:
                         baseline_image_ref = _download_file(baseline_dir, filename)
                     else:
-                        baseline_image_ref = os.path.abspath(os.path.join(os.path.dirname(item.fspath.strpath), baseline_dir, filename))
+                        baseline_image_ref = os.path.abspath(os.path.join(
+                            os.path.dirname(item.fspath.strpath), baseline_dir, filename))
 
                     if not os.path.exists(baseline_image_ref):
                         pytest.fail("Image file not found for comparison test in: "
                                     "\n\t{baseline_dir}"
                                     "\n(This is expected for new tests.)\nGenerated Image: "
-                                    "\n\t{test}".format(baseline_dir=baseline_dir, test=test_image), pytrace=False)
+                                    "\n\t{test}".format(baseline_dir=baseline_dir,
+                                                        test=test_image),
+                                    pytrace=False)
 
                     # distutils may put the baseline images in non-accessible places,
                     # copy to our tmpdir to be sure to keep them in case of failure
-                    baseline_image = os.path.abspath(os.path.join(result_dir, 'baseline-' + filename))
+                    baseline_image = os.path.abspath(os.path.join(result_dir,
+                                                                  'baseline-' + filename))
                     shutil.copyfile(baseline_image_ref, baseline_image)
 
-                    # Compare image size ourselves since the Matplotlib exception is a bit cryptic in this case
-                    # and doesn't show the filenames
+                    # Compare image size ourselves since the Matplotlib
+                    # exception is a bit cryptic in this case and doesn't show
+                    # the filenames
                     expected_shape = Image.open(baseline_image).size
                     actual_shape = Image.open(test_image).size
                     if expected_shape != actual_shape:
@@ -305,7 +312,8 @@ def item_function_wrapper(*args, **kwargs):
                     if not os.path.exists(self.generate_dir):
                         os.makedirs(self.generate_dir)
 
-                    fig.savefig(os.path.abspath(os.path.join(self.generate_dir, filename)), **savefig_kwargs)
+                    fig.savefig(os.path.abspath(os.path.join(self.generate_dir, filename)),
+                                **savefig_kwargs)
                     close_mpl_figure(fig)
                     pytest.skip("Skipping test, since generating data")
 
@@ -331,8 +339,6 @@ def pytest_runtest_setup(self, item):
         if compare is None:
             return
 
-        import matplotlib.pyplot as plt
-
         original = item.function
 
         @wraps(item.function)

tests/test_pytest_mpl.py

@@ -67,6 +67,7 @@ def test_dpi():
     ax.plot([1, 2, 3])
     return fig
 
+
 TEST_FAILING = """
 import pytest
 import matplotlib.pyplot as plt
@@ -113,14 +114,16 @@ def test_output_dir(tmpdir):
 
     # When we run the test, we should get output images where we specify
     output_dir = tmpdir.join('test_output_dir').strpath
-    code = subprocess.call('{0} -m pytest --mpl-results-path={1} --mpl {2}'.format(sys.executable, output_dir, test_file),
+    code = subprocess.call('{0} -m pytest --mpl-results-path={1} --mpl {2}'
+                           .format(sys.executable, output_dir, test_file),
                            shell=True)
 
     assert code != 0
     assert os.path.exists(output_dir)
 
     # Listdir() is to get the random name that the output for the one test is written into
-    assert os.path.exists(os.path.join(output_dir, os.listdir(output_dir)[0], 'test_output_dir.png'))
+    assert os.path.exists(os.path.join(output_dir, os.listdir(output_dir)[0],
+                                       'test_output_dir.png'))
 
 
 TEST_GENERATE = """
@@ -156,7 +159,8 @@ def test_generate(tmpdir):
     assert b'Image file not found for comparison test' in p.stdout.read()
 
     # If we do generate, the test should succeed and a new file will appear
-    code = subprocess.call('{0} -m pytest --mpl-generate-path={1} {2}'.format(sys.executable, gen_dir, test_file), shell=True)
+    code = subprocess.call('{0} -m pytest --mpl-generate-path={1} {2}'
+                           .format(sys.executable, gen_dir, test_file), shell=True)
     assert code == 0
     assert os.path.exists(os.path.join(gen_dir, 'test_gen.png'))
 
@@ -173,7 +177,8 @@ def test_nofigure():
     pass
 
 
-@pytest.mark.skipif(MPL_LT_2, reason="the fivethirtyeight style is only available in Matplotlib 2.0 and later")
+@pytest.mark.skipif(MPL_LT_2, reason="the fivethirtyeight style is only available "
+                                     "in Matplotlib 2.0 and later")
 @pytest.mark.mpl_image_compare(baseline_dir=baseline_dir_local,
                                style='fivethirtyeight')
 def test_base_style():
@@ -198,7 +203,7 @@ def test_remove_text():
 def test_parametrized(s):
     fig = plt.figure()
     ax = fig.add_subplot(1, 1, 1)
-    ax.scatter([1,3,4,3,2],[1,4,3,3,1], s=s)
+    ax.scatter([1, 3, 4, 3, 2], [1, 4, 3, 3, 1], s=s)
     return fig
 
 

tox.ini

@@ -7,8 +7,7 @@ requires =
     pip >= 19.3.1
 
 [testenv]
-passenv =
-    DISPLAY
+passenv = DISPLAY
 changedir = .tmp/{envname}
 description = run tests
 deps =
@@ -31,8 +30,9 @@ commands =
 
 [testenv:codestyle]
 skip_install = true
+changedir = .
 description = check code style, e.g. with flake8
 deps = flake8
 commands =
-    flake8 pytest_mpl tests --count
+    flake8 pytest_mpl tests --count --max-line-length=100
     python setup.py check --restructuredtext