Skip to content

Test cleanups. #13981

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 18, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion lib/matplotlib/tests/test_mlab.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

from numpy.testing import (assert_allclose, assert_almost_equal,
assert_array_equal, assert_array_almost_equal_nulp)
import numpy.ma.testutils as matest
import numpy as np
import datetime as datetime
import pytest
Expand Down
2 changes: 0 additions & 2 deletions lib/matplotlib/tests/test_png.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@
from matplotlib.testing.decorators import image_comparison
from matplotlib import pyplot as plt
import matplotlib.cm as cm
import sys
on_win = (sys.platform == 'win32')


@image_comparison(baseline_images=['pngsuite'], extensions=['png'],
Expand Down
19 changes: 8 additions & 11 deletions lib/matplotlib/tests/test_triangulation.py
Original file line number Diff line number Diff line change
@@ -1,16 +1,14 @@
import numpy as np
import matplotlib.pyplot as plt
import matplotlib.tri as mtri
import pytest
from numpy.testing import assert_array_equal, assert_array_almost_equal,\
assert_array_less
from numpy.testing import (
assert_array_equal, assert_array_almost_equal, assert_array_less)
import numpy.ma.testutils as matest
from matplotlib.testing.decorators import image_comparison
import pytest

import matplotlib.cm as cm
import matplotlib.pyplot as plt
import matplotlib.tri as mtri
from matplotlib.path import Path

import sys
on_win = (sys.platform == 'win32')
from matplotlib.testing.decorators import image_comparison


def test_delaunay():
Expand Down Expand Up @@ -729,8 +727,7 @@ def z(x, y):
dic_interp = {'lin': linear_interp,
'min_E': cubic_min_E,
'geom': cubic_geom}
# Testing that the interpolation is invariant by expansion along
# 1 axis...
# Test that the interpolation is invariant by expansion along 1 axis...
for interp_key in ['lin', 'min_E', 'geom']:
interpz = dic_interp[interp_key](xs, ys)
matest.assert_array_almost_equal(interpz, interp_z0[interp_key])
Expand Down