new isort

nschloe · nschloe · commit 3f2f4db96874 · 2020-07-24T12:42:14.000+02:00
diff --git a/test/helpers.py b/test/helpers.py
@@ -45,7 +45,7 @@ def assert_equality(
     this_dir = os.path.dirname(os.path.abspath(__file__))
     with open(os.path.join(this_dir, filename), encoding="utf-8") as f:
         reference = f.read()
-    assert reference == code, _unidiff_output(code, reference)
+    assert reference == code, _unidiff_output(reference, code)
 
     if assert_compilation:
         plot()
diff --git a/test/test_annotate.py b/test/test_annotate.py
@@ -1,6 +1,5 @@
 import matplotlib.pyplot as plt
 import numpy as np
-
 from helpers import assert_equality
 
 
diff --git a/test/test_axvline.py b/test/test_axvline.py
@@ -1,6 +1,5 @@
 import matplotlib.pyplot as plt
 import numpy as np
-
 from helpers import assert_equality
 
 
diff --git a/test/test_barchart.py b/test/test_barchart.py
@@ -5,7 +5,6 @@
 """
 import matplotlib.pyplot as plt
 import numpy as np
-
 from helpers import assert_equality
 
 
diff --git a/test/test_barchart_errorbars.py b/test/test_barchart_errorbars.py
@@ -5,7 +5,6 @@
 """
 import matplotlib.pyplot as plt
 import numpy as np
-
 from helpers import assert_equality
 
 
diff --git a/test/test_barchart_legend.py b/test/test_barchart_legend.py
@@ -9,7 +9,6 @@
 """
 import matplotlib.pyplot as plt
 import numpy as np
-
 from helpers import assert_equality
 
 
@@ -34,7 +33,6 @@ def plot():
 
 def test():
     assert_equality(plot, "test_barchart_legend_reference.tex")
-    return
 
 
 if __name__ == "__main__":
diff --git a/test/test_barchart_legend_reference.tex b/test/test_barchart_legend_reference.tex
@@ -2,7 +2,7 @@
 
 \begin{axis}[
 legend cell align={left},
-legend style={fill opacity=0.8, draw opacity=1, text opacity=1, draw=white!80!black},
+legend style={fill opacity=0.8, draw opacity=1, text opacity=1, at={(0.5,0.91)}, anchor=north, draw=white!80!black},
 tick align=outside,
 tick pos=left,
 x grid style={white!69.019608!black},
diff --git a/test/test_basic_sin.py b/test/test_basic_sin.py
@@ -1,6 +1,5 @@
 import matplotlib.pyplot as plt
 import numpy as np
-
 from helpers import assert_equality
 
 
diff --git a/test/test_boxplot.py b/test/test_boxplot.py
@@ -6,7 +6,6 @@
 See: https://github.com/nschloe/tikzplotlib/pull/134
 """
 import matplotlib.pyplot as plt
-
 from helpers import assert_equality
 
 
diff --git a/test/test_cleanfigure.py b/test/test_cleanfigure.py
@@ -203,7 +203,7 @@ def test_wireframe3D(self):
 
     def test_surface3D(self):
         from matplotlib import cm
-        from matplotlib.ticker import LinearLocator, FormatStrFormatter
+        from matplotlib.ticker import FormatStrFormatter, LinearLocator
 
         # Make data.
         X = np.arange(-5, 5, 0.25)
@@ -265,8 +265,8 @@ def test_trisurface3D(self):
         plt.close("all")
 
     def test_contour3D(self):
-        from mpl_toolkits.mplot3d import axes3d
         from matplotlib import cm
+        from mpl_toolkits.mplot3d import axes3d
 
         with plt.rc_context(rc=RC_PARAMS):
             fig = plt.figure()
@@ -279,8 +279,8 @@ def test_contour3D(self):
         plt.close("all")
 
     def test_polygon3D(self):
-        from matplotlib.collections import PolyCollection
         from matplotlib import colors as mcolors
+        from matplotlib.collections import PolyCollection
 
         with plt.rc_context(rc=RC_PARAMS):
             fig = plt.figure()
diff --git a/test/test_colorbars.py b/test/test_colorbars.py
@@ -1,6 +1,5 @@
 import matplotlib as mpl
 import matplotlib.pyplot as plt
-
 from helpers import assert_equality
 
 
diff --git a/test/test_context.py b/test/test_context.py
@@ -2,9 +2,9 @@
 
 
 def plot():
-    import numpy as np
-    import matplotlib.pyplot as plt
     import matplotlib.cm as cm
+    import matplotlib.pyplot as plt
+    import numpy as np
 
     x, y = np.meshgrid(np.linspace(0, 1), np.linspace(0, 1))
     z = x ** 2 - y ** 2
diff --git a/test/test_contourf.py b/test/test_contourf.py
@@ -1,6 +1,5 @@
 import matplotlib.pyplot as plt
 import numpy as np
-
 from helpers import assert_equality
 
 
diff --git a/test/test_custom_collection.py b/test/test_custom_collection.py
@@ -6,7 +6,6 @@
 import matplotlib
 import matplotlib.pyplot as plt
 import numpy as np
-
 from helpers import assert_equality
 
 
diff --git a/test/test_datetime.py b/test/test_datetime.py
@@ -1,9 +1,8 @@
 import datetime as date
 
 import matplotlib.pyplot as plt
-from matplotlib import dates
-
 from helpers import assert_equality
+from matplotlib import dates
 
 
 def plot():
diff --git a/test/test_datetime_paths.py b/test/test_datetime_paths.py
@@ -1,9 +1,8 @@
 import datetime as date
 
 import matplotlib.pyplot as plt
-from matplotlib import dates
-
 from helpers import assert_equality
+from matplotlib import dates
 
 
 def plot():
diff --git a/test/test_dual_axis.py b/test/test_dual_axis.py
@@ -1,6 +1,5 @@
 import matplotlib.pyplot as plt
 import numpy as np
-
 from helpers import assert_equality
 
 
diff --git a/test/test_errorband.py b/test/test_errorband.py
@@ -1,6 +1,5 @@
 import matplotlib.pyplot as plt
 import numpy as np
-
 from helpers import assert_equality
 
 
diff --git a/test/test_errorbar.py b/test/test_errorbar.py
@@ -1,5 +1,4 @@
 import matplotlib.pyplot as plt
-
 from helpers import assert_equality
 
 
diff --git a/test/test_escape_chars.py b/test/test_escape_chars.py
@@ -1,6 +1,5 @@
 # https://github.com/nschloe/tikzplotlib/issues/332
 import matplotlib.pyplot as plt
-
 from helpers import assert_equality
 
 
diff --git a/test/test_externalize_tables.py b/test/test_externalize_tables.py
@@ -2,8 +2,8 @@
 
 
 def plot():
-    from matplotlib import pyplot as plt
     import numpy as np
+    from matplotlib import pyplot as plt
 
     fig = plt.figure()
     with plt.style.context("ggplot"):
diff --git a/test/test_fancy_colorbar.py b/test/test_fancy_colorbar.py
@@ -1,6 +1,5 @@
 import matplotlib.pyplot as plt
 import numpy as np
-
 from helpers import assert_equality
 
 
diff --git a/test/test_fancybox.py b/test/test_fancybox.py
@@ -1,9 +1,8 @@
 # Taken from http://matplotlib.org/examples/pylab_examples/fancybox_demo.html
 import matplotlib.pyplot as plt
 import matplotlib.transforms as mtransforms
-from matplotlib.patches import FancyBboxPatch
-
 from helpers import assert_equality
+from matplotlib.patches import FancyBboxPatch
 
 # Bbox object around which the fancy box will be drawn.
 bb = mtransforms.Bbox([[0.3, 0.4], [0.7, 0.6]])
diff --git a/test/test_fillstyle.py b/test/test_fillstyle.py
@@ -1,6 +1,5 @@
 import matplotlib.pyplot as plt
 import numpy as np
-
 from helpers import assert_equality
 
 
diff --git a/test/test_heat.py b/test/test_heat.py
@@ -1,7 +1,6 @@
 import matplotlib
 import matplotlib.pyplot as plt
 import numpy as np
-
 from helpers import assert_equality
 
 
diff --git a/test/test_histogram.py b/test/test_histogram.py
@@ -1,6 +1,5 @@
 import matplotlib.pyplot as plt
 import numpy as np
-
 from helpers import assert_equality
 
 
diff --git a/test/test_image_plot_lower.py b/test/test_image_plot_lower.py
@@ -1,16 +1,16 @@
 import matplotlib.pyplot as plt
-
 from helpers import assert_equality
 
 # the picture 'lena.png' with origin='lower' is flipped upside-down.
 # So it has to be upside-down in the pdf-file as well.
 
 
 def plot():
-    from matplotlib import rcParams
-    import matplotlib.image as mpimg
     import os
 
+    import matplotlib.image as mpimg
+    from matplotlib import rcParams
+
     this_dir = os.path.dirname(os.path.realpath(__file__))
     img = mpimg.imread(os.path.join(this_dir, "lena.png"))
 
diff --git a/test/test_image_plot_upper.py b/test/test_image_plot_upper.py
@@ -5,10 +5,11 @@
 
 
 def plot():
-    from matplotlib import rcParams
-    import matplotlib.image as mpimg
     import os
 
+    import matplotlib.image as mpimg
+    from matplotlib import rcParams
+
     this_dir = os.path.dirname(os.path.realpath(__file__))
     img = mpimg.imread(os.path.join(this_dir, "lena.png"))
 
diff --git a/test/test_legend_best_location.py b/test/test_legend_best_location.py
@@ -1,6 +1,5 @@
 import matplotlib.pyplot as plt
 import numpy as np
-
 from helpers import assert_equality
 
 
diff --git a/test/test_legend_columns.py b/test/test_legend_columns.py
@@ -2,8 +2,8 @@
 
 
 def plot():
-    import numpy as np
     import matplotlib.pyplot as plt
+    import numpy as np
 
     fig, ax = plt.subplots(figsize=(17, 6))
     ax.plot(np.array([1, 5]), label="Test 1")
diff --git a/test/test_legend_labels.py b/test/test_legend_labels.py
@@ -2,8 +2,8 @@
 
 
 def plot():
-    from matplotlib import pyplot as plt
     import numpy as np
+    from matplotlib import pyplot as plt
 
     fig = plt.figure()
 
diff --git a/test/test_legend_line_scatter.py b/test/test_legend_line_scatter.py
@@ -1,6 +1,5 @@
 import matplotlib.pyplot as plt
 import numpy as np
-
 from helpers import assert_equality
 
 
diff --git a/test/test_legends.py b/test/test_legends.py
@@ -2,8 +2,8 @@
 
 
 def plot():
-    from matplotlib import pyplot as plt
     import numpy as np
+    from matplotlib import pyplot as plt
 
     fig = plt.figure()
 
diff --git a/test/test_legends2.py b/test/test_legends2.py
@@ -2,8 +2,8 @@
 
 
 def plot():
-    from matplotlib import pyplot as plt
     import numpy as np
+    from matplotlib import pyplot as plt
 
     fig, ax = plt.subplots(3, 3, sharex="col", sharey="row")
     axes = [ax[i][j] for i in range(len(ax)) for j in range(len(ax[i]))]
diff --git a/test/test_line_color_marker.py b/test/test_line_color_marker.py
@@ -2,8 +2,8 @@
 
 
 def plot():
-    from matplotlib import pyplot as plt
     import numpy as np
+    from matplotlib import pyplot as plt
 
     fig = plt.figure()
     with plt.style.context("ggplot"):
diff --git a/test/test_line_dashes.py b/test/test_line_dashes.py
@@ -1,5 +1,4 @@
 import matplotlib.pyplot as plt
-
 from helpers import assert_equality
 
 
diff --git a/test/test_line_set_data.py b/test/test_line_set_data.py
@@ -1,6 +1,5 @@
 # from <https://github.com/nschloe/tikzplotlib/issues/339>
 import matplotlib.pyplot as plt
-
 from helpers import assert_equality
 
 
diff --git a/test/test_loglogplot.py b/test/test_loglogplot.py
@@ -1,6 +1,5 @@
 import matplotlib.pyplot as plt
 import numpy as np
-
 from helpers import assert_equality
 
 
diff --git a/test/test_logplot.py b/test/test_logplot.py
@@ -1,5 +1,4 @@
 import matplotlib.pyplot as plt
-
 from helpers import assert_equality
 
 
diff --git a/test/test_marker.py b/test/test_marker.py
@@ -1,6 +1,5 @@
 import matplotlib.pyplot as plt
 import numpy as np
-
 from helpers import assert_equality
 
 
diff --git a/test/test_noise.py b/test/test_noise.py
@@ -1,6 +1,5 @@
 import matplotlib.pyplot as plt
 import numpy as np
-
 from helpers import assert_equality
 
 
diff --git a/test/test_noise2.py b/test/test_noise2.py
@@ -1,6 +1,5 @@
 import matplotlib.pyplot as plt
 import numpy as np
-
 from helpers import assert_equality
 
 
diff --git a/test/test_pandas_dataframe.py b/test/test_pandas_dataframe.py
@@ -1,6 +1,5 @@
 import matplotlib.pyplot as plt
 import pandas as pd
-
 from helpers import assert_equality
 
 
diff --git a/test/test_patch_styles.py b/test/test_patch_styles.py
diff --git a/test/test_patches.py b/test/test_patches.py
diff --git a/test/test_quadmesh.py b/test/test_quadmesh.py
diff --git a/test/test_scatter.py b/test/test_scatter.py
diff --git a/test/test_scatter_colormap.py b/test/test_scatter_colormap.py
diff --git a/test/test_sharex_and_y.py b/test/test_sharex_and_y.py
diff --git a/test/test_subplot4x4.py b/test/test_subplot4x4.py
diff --git a/test/test_subplots.py b/test/test_subplots.py
diff --git a/test/test_subplots_with_colorbars.py b/test/test_subplots_with_colorbars.py
diff --git a/test/test_text_overlay.py b/test/test_text_overlay.py
diff --git a/test/test_viridis.py b/test/test_viridis.py
