|
27 | 27 | import numpy as np |
28 | 28 | import pytest |
29 | 29 | from MDAnalysis.analysis import backends, base |
30 | | -from numpy.testing import assert_allclose, assert_almost_equal, assert_equal |
| 30 | +from numpy.testing import assert_allclose, assert_equal |
31 | 31 |
|
32 | 32 | from MDAnalysisTests.datafiles import DCD, PSF, TPR, XTC |
33 | 33 | from MDAnalysisTests.util import no_deprecated_call |
@@ -279,7 +279,7 @@ def test_start_stop_step_parallel(u, run_kwargs, frames, client_FrameAnalysis): |
279 | 279 | assert an.n_frames == len(frames) |
280 | 280 | assert_equal(an.found_frames, frames) |
281 | 281 | assert_equal(an.frames, frames, err_msg=FRAMES_ERR) |
282 | | - assert_almost_equal(an.times, frames + 1, decimal=4, err_msg=TIMES_ERR) |
| 282 | + assert_allclose(an.times, frames + 1, rtol=0, atol=1e-4, err_msg=TIMES_ERR) |
283 | 283 |
|
284 | 284 |
|
285 | 285 | def test_reset_n_parts_to_n_frames(u): |
@@ -614,7 +614,7 @@ def test_AnalysisFromFunction_args_content(u, client_AnalysisFromFunction): |
614 | 614 | assert len(ans.args) == 3 |
615 | 615 | result = np.sum(ans.run(**client_AnalysisFromFunction).results.timeseries) |
616 | 616 | assert_allclose(result, -317054.67757345125, rtol=0, atol=1.5e-6) |
617 | | - assert_almost_equal(result, -317054.67757345125, decimal=6) |
| 617 | + assert_allclose(result, -317054.67757345125, rtol=0, atol=1e-6) |
618 | 618 | assert (ans.args[0] is protein) and (ans.args[1] is another) |
619 | 619 | assert ans._trajectory is protein.universe.trajectory |
620 | 620 |
|
|
0 commit comments