Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Make test_analysis PyTest #5859

Merged
merged 4 commits into from
Mar 19, 2024
Merged

Make test_analysis PyTest #5859

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d5562a3
Fixes to _shared_utils.
trexfeathers Mar 18, 2024
b1d1e9c
Make test_analysis.py pytest.
trexfeathers Mar 18, 2024
49f7cdb
Make test_analysis_calculus.py pytest.
trexfeathers Mar 18, 2024
bcaca28
Remove np.testing.
trexfeathers Mar 19, 2024
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
6 changes: 3 additions & 3 deletions lib/iris/tests/_shared_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,7 +311,7 @@ def assert_CML_approx_data(
fname[-1] = fname[-1][:-4]
fname[-1] += ".data.%d.json" % i
assert_data_almost_equal(cube.data, fname, **kwargs)
assert_CML(cubes, reference_filename, checksum=False)
assert_CML(request, cubes, reference_filename, checksum=False)


def assert_CDL(
Expand Down Expand Up @@ -459,8 +459,8 @@ def assert_data_almost_equal(data, reference_filename, **kwargs):
kwargs.setdefault("err_msg", "Reference file %s" % reference_path)
with open(reference_path, "r") as reference_file:
stats = json.load(reference_file)
assert stats.get("shape", []), list(data.shape)
assert stats.get("masked", False), ma.is_masked(data)
assert stats.get("shape", []) == list(data.shape)
assert stats.get("masked", False) == ma.is_masked(data)
nstats = np.array(
(
stats.get("mean", 0.0),
Expand Down
Loading
Loading