Skip to content

Commit 8324998

Browse files
authored
Merge pull request #4013 from dopplershift/fix-cartopy
Bump Cartopy to 0.25
2 parents f8cf0fa + 09761d6 commit 8324998

File tree

5 files changed

+8
-4
lines changed

5 files changed

+8
-4
lines changed

.github/actions/install-conda/action.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ runs:
3131

3232
- name: Install dependencies
3333
shell: bash -l {0}
34-
run: micromamba install --yes --file ci-dev/${{ inputs.type }}_requirements.txt --file ci/extra_requirements.txt --file ci/requirements.txt
34+
run: micromamba install --yes --file ci-dev/${{ inputs.type }}_requirements.txt --file ci/extra_requirements.txt --file ci/requirements.txt "proj<9.8.0"
3535

3636
- name: Download Cartopy Maps
3737
if: ${{ inputs.need-cartopy == 'true' }}

ci/extra_requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
cartopy==0.24.0
1+
cartopy==0.25.0
22
dask==2026.1.2
33
netCDF4==1.7.4
44
shapely==2.1.2
7 Bytes
Loading
-2.57 KB
Loading

tests/plots/test_declarative.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -475,7 +475,8 @@ def test_declarative_contour_convert_units():
475475

476476

477477
@pytest.mark.mpl_image_compare(remove_text=True,
478-
tolerance=5.34 if version_check('matplotlib<3.10') else 0.246)
478+
tolerance=7.85 if (version_check('matplotlib<3.10') or
479+
version_check('cartopy<0.25')) else 0.246)
479480
@needs_cartopy
480481
def test_declarative_events():
481482
"""Test that resetting traitlets properly propagates."""
@@ -827,7 +828,8 @@ def test_global():
827828

828829

829830
@pytest.mark.mpl_image_compare(remove_text=True,
830-
tolerance=5.101 if version_check('matplotlib<3.10') else 0.044)
831+
tolerance=7.891 if (version_check('matplotlib<3.10') or
832+
version_check('cartopy<0.25')) else 0.019)
831833
@needs_cartopy
832834
def test_latlon():
833835
"""Test our handling of lat/lon information."""
@@ -1784,6 +1786,8 @@ def test_declarative_title_fontsize():
17841786
return pc.figure
17851787

17861788

1789+
# Broken on Cartopy 0.25 due to 0-area filled contour. See SciTools/cartopy#2635
1790+
@pytest.mark.xfail(version_check('cartopy==0.25.0'), reason='SciTools/cartopy#2635')
17871791
@pytest.mark.mpl_image_compare(remove_text=False,
17881792
tolerance=0.951 if version_check('cartopy<0.23') else 0.)
17891793
@needs_cartopy

0 commit comments

Comments
 (0)