Remove unittest reliance on optional dependencies by ESadek-MO · Pull Request #6976 · SciTools/iris

ESadek-MO · 2026-03-11T21:36:26Z

🚀 Pull Request

Description

Add any of the below labels to trigger actions on this PR:

benchmark_this Request that this pull request be benchmarked to check if it introduces performance shifts

ESadek-MO · 2026-03-11T21:37:50Z

This can be reviewed, all changes are for this, but I messed up branch management so will either need a rebase or a copy over

codecov · 2026-03-12T15:39:38Z

Codecov Report

✅ All modified and coverable lines are covered by tests.
✅ Project coverage is 90.12%. Comparing base (043b0bc) to head (95d6960).
⚠️ Report is 3 commits behind head on main.

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #6976      +/-   ##
==========================================
+ Coverage   90.11%   90.12%   +0.01%     
==========================================
  Files          91       91              
  Lines       24912    24951      +39     
  Branches     4675     4683       +8     
==========================================
+ Hits        22449    22488      +39     
  Misses       1684     1684              
  Partials      779      779

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

🚀 New features to boost your workflow:

❄️ Test Analytics: Detect flaky tests, report on failures, and find test suite problems.

pp-mo

There's been a bit of confusion with files that should have moved from unit to integration,
but the old place didn't get deleted.

Otherwise, looking pretty good !

pp-mo · 2026-03-13T18:08:56Z

lib/iris/tests/integration/experimental/stratify/test_relevel.py

+try:
+    import stratify
+
+    from iris.experimental.stratify import relevel
+except ImportError:
+    stratify = None
+
+
+@_shared_utils.skip_stratify
+class Test:


Do we actually need to be able to run integration tests with no stratify available?
If not, we don't need all this.

... and if we do need it, then there's a neat standard PyTest way to skip a whole file of tests when an import is unavailable,
called importorskip

I would still like this here, as a just in case. However, I don't think refactoring falls within the scope here so much. If I find there's time to do this after the rest of the work has been done, I will, else I think this becomes a standalone issue, perhaps.

pp-mo · 2026-03-13T18:58:36Z

lib/iris/tests/unit/pandas/test_pandas.py

-        _shared_utils.assert_array_equal(series, cube.data)
-        _shared_utils.assert_array_equal(series.index, expected_index)
+        expected_index = dim_coord.points[0]
+        expected_data = cube.data


This new version of the test is all OK as the new unit test,
but it seems to have lost a lot, including all the tests 'test_masked', 'test_time_standard', 'test_time_360' and 'test_copy_masked_true'.

Did you mean to add a copy of the old version (or parts of it) in tests/integration ?

pp-mo · 2026-03-13T19:03:04Z

lib/iris/tests/unit/pandas/test_pandas.py

FWIW I think you could replace all this with "importorskip", since IIUC the whole file will be skipped if there is no pandas.

pp-mo · 2026-03-13T19:08:36Z

lib/iris/tests/integration/experimental/regrid/test_regrid_conservative_via_esmpy.py

+#
+# This file is part of Iris and is released under the BSD license.
+# See LICENSE in the root of the repository for full licensing details.
+"""Tests for :func:`iris.experimental.regrid.regrid_conservative_via_esmpy`."""


Since it doesn't say "unit tests", this doesn't need to be changed to "integration" (!) 👍

BUT.. this should appear as a file move, not a new file.
You need to delete the original lib/iris/tests/experimental/regrid/test_regrid_conservative_via_esmpy.py

pp-mo · 2026-03-13T19:11:47Z

lib/iris/tests/results/integration/experimental/stratify/relevel/multi_dim_target_levels.cml

@@ -0,0 +1,18 @@
+<?xml version="1.0" ?>


Should appear as a move, not a new file.
Need to delete lib/iris/tests/results/unit/experimental/stratify/relevel/multi_dim_target_levels.cml

pp-mo · 2026-03-13T19:21:39Z

lib/iris/tests/integration/util/test_mask_cube_from_shapefile.py

+#
+# This file is part of Iris and is released under the BSD license.
+# See LICENSE in the root of the repository for full licensing details.
+"""Unit tests for :func:`iris.util.mask_cube_from_shapefile`."""


Needs rename

Suggested change

"""Unit tests for :func:`iris.util.mask_cube_from_shapefile`."""

"""Integration tests for :func:`iris.util.mask_cube_from_shapefile`."""

pp-mo

More.
Not sure why it wouldn't let me add this one to the existing review, I'm sure it let me do that with the previous one ??

pp-mo · 2026-03-13T19:25:17Z

lib/iris/tests/integration/util/test_mask_cube_from_shapefile.py

+
+import numpy as np
+import pytest
+from shapely.geometry import box


Nothing wrong with this,
But weirdly, we still have the same line in the original source
tests/unit/util/test_mask_cube_from_shapefile.py.

So, that will fail when remove the deps, and seems to need fixing somehow.

Please check I've done this as you meant!

ESadek-MO

Also needs a whatsnew!

ESadek-MO added 14 commits February 17, 2026 15:18

init commit

89e72b7

A bunch more deprecation warnings and a whatsnew

39ac116

A bunch more deprecation warnings and a whatsnew

36e3444

Missed whatsnews from previous pytest work

cfb2c32

corrected whatsnew formatting

5afb748

Merge branch 'main' of github.com:SciTools/iris into deprecate_iristest

cdecab9

stratify

6afa3c9

stratify

4ffcb55

geovista

5f6deef

geovista

c55410b

regridding

f61de54

stratify and extras

b272279

regridding

052c98d

constraints

db818a7

ESadek-MO requested a review from pp-mo March 11, 2026 21:36

scitools-ci bot added this to 🚴 Peloton Mar 12, 2026

ESadek-MO and others added 7 commits March 12, 2026 09:44

Merge branch 'main' into core_deps

5498df4

fix stratify failures

2d92178

Merge branch 'core_deps' of github.com:ESadek-MO/iris into core_deps

a42ba80

fix stratify failures

b8ce28d

licesnse header fix

5df8506

pandas

21ac335

added cml

21268ec

ESadek-MO marked this pull request as ready for review March 12, 2026 16:01

pp-mo requested changes Mar 13, 2026

View reviewed changes

pp-mo reviewed Mar 13, 2026

View reviewed changes

pp-mo requested changes Mar 13, 2026

View reviewed changes

pp-mo linked an issue Mar 16, 2026 that may be closed by this pull request

Only use core dependencies for unit tests #6832

Open

5 tasks

ESadek-MO added 2 commits March 16, 2026 10:48

deleted old files

5b890f1

moved pandas

8c1404f

ESadek-MO commented Mar 16, 2026

View reviewed changes

ESadek-MO added 2 commits March 16, 2026 16:00

whatsnew

e8244c1

remove skips for integration tests

95d6960

	"""Unit tests for :func:`iris.util.mask_cube_from_shapefile`."""
	"""Integration tests for :func:`iris.util.mask_cube_from_shapefile`."""

Conversation

ESadek-MO commented Mar 11, 2026

🚀 Pull Request

Description

Uh oh!

ESadek-MO commented Mar 11, 2026

Uh oh!

codecov bot commented Mar 12, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

pp-mo left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

pp-mo left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

ESadek-MO left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

codecov bot commented Mar 12, 2026 •

edited

Loading