Skip to content
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
2 changes: 1 addition & 1 deletion .github/actions/install-conda/action.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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' }}
Expand Down
2 changes: 1 addition & 1 deletion ci/extra_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cartopy==0.24.0
cartopy==0.25.0
dask==2026.1.2
netCDF4==1.7.4
shapely==2.1.2
Expand Down
Binary file modified tests/plots/baseline/test_declarative_events.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified tests/plots/baseline/test_latlon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 6 additions & 2 deletions tests/plots/test_declarative.py
Original file line number Diff line number Diff line change
Expand Up @@ -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."""
Expand Down Expand Up @@ -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."""
Expand Down Expand Up @@ -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
Expand Down
Loading