diff --git a/.github/actions/install-conda/action.yml b/.github/actions/install-conda/action.yml index 6989e6cdb02..6660035d875 100644 --- a/.github/actions/install-conda/action.yml +++ b/.github/actions/install-conda/action.yml @@ -31,7 +31,7 @@ runs: - name: Install dependencies shell: bash -l {0} - run: micromamba install --yes --file ci-dev/${{ inputs.type }}_requirements.txt --file ci/extra_requirements.txt --file ci/requirements.txt + run: micromamba install --yes --file ci-dev/${{ inputs.type }}_requirements.txt --file ci/extra_requirements.txt --file ci/requirements.txt "proj<9.8.0" - name: Download Cartopy Maps if: ${{ inputs.need-cartopy == 'true' }} diff --git a/ci/extra_requirements.txt b/ci/extra_requirements.txt index dfefc91bfc1..f35d73f9e25 100644 --- a/ci/extra_requirements.txt +++ b/ci/extra_requirements.txt @@ -1,4 +1,4 @@ -cartopy==0.24.0 +cartopy==0.25.0 dask==2026.1.2 netCDF4==1.7.4 shapely==2.1.2 diff --git a/tests/plots/baseline/test_declarative_events.png b/tests/plots/baseline/test_declarative_events.png index 868ac10b53f..0fd3398657a 100644 Binary files a/tests/plots/baseline/test_declarative_events.png and b/tests/plots/baseline/test_declarative_events.png differ diff --git a/tests/plots/baseline/test_latlon.png b/tests/plots/baseline/test_latlon.png index d1876166afa..67b53c3837e 100644 Binary files a/tests/plots/baseline/test_latlon.png and b/tests/plots/baseline/test_latlon.png differ diff --git a/tests/plots/test_declarative.py b/tests/plots/test_declarative.py index 0effc37a73b..63e537a0c4b 100644 --- a/tests/plots/test_declarative.py +++ b/tests/plots/test_declarative.py @@ -475,7 +475,8 @@ def test_declarative_contour_convert_units(): @pytest.mark.mpl_image_compare(remove_text=True, - tolerance=5.34 if version_check('matplotlib<3.10') else 0.246) + tolerance=7.85 if (version_check('matplotlib<3.10') or + version_check('cartopy<0.25')) else 0.246) @needs_cartopy def test_declarative_events(): """Test that resetting traitlets properly propagates.""" @@ -827,7 +828,8 @@ def test_global(): @pytest.mark.mpl_image_compare(remove_text=True, - tolerance=5.101 if version_check('matplotlib<3.10') else 0.044) + tolerance=7.891 if (version_check('matplotlib<3.10') or + version_check('cartopy<0.25')) else 0.019) @needs_cartopy def test_latlon(): """Test our handling of lat/lon information.""" @@ -1784,6 +1786,8 @@ def test_declarative_title_fontsize(): return pc.figure +# Broken on Cartopy 0.25 due to 0-area filled contour. See SciTools/cartopy#2635 +@pytest.mark.xfail(version_check('cartopy==0.25.0'), reason='SciTools/cartopy#2635') @pytest.mark.mpl_image_compare(remove_text=False, tolerance=0.951 if version_check('cartopy<0.23') else 0.) @needs_cartopy