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
9 changes: 5 additions & 4 deletions lib/cartopy/tests/mpl/test_images.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,17 @@
import pytest
import shapely.geometry as sgeom

from cartopy import config
import cartopy.crs as ccrs
import cartopy.io.img_tiles as cimgt
from cartopy.tests.conftest import _HAS_PYKDTREE_OR_SCIPY
import cartopy.tests.test_img_tiles as ctest_tiles


if not _HAS_PYKDTREE_OR_SCIPY:
pytest.skip('pykdtree or scipy is required', allow_module_level=True)

from cartopy import config
import cartopy.crs as ccrs
import cartopy.io.img_tiles as cimgt
import cartopy.tests.test_img_tiles as ctest_tiles


NATURAL_EARTH_IMG = (config["repo_data_dir"] / 'raster' / 'natural_earth'
/ '50-natural-earth-1-downsampled.png')
Expand Down
6 changes: 6 additions & 0 deletions lib/cartopy/tests/test_img_tiles.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,12 @@
import pytest
import shapely.geometry as sgeom

from cartopy.tests.conftest import _HAS_PYKDTREE_OR_SCIPY


if not _HAS_PYKDTREE_OR_SCIPY:
pytest.skip('pykdtree or scipy is required', allow_module_level=True)

from cartopy import config
import cartopy.crs as ccrs
import cartopy.io.img_tiles as cimgt
Expand Down
Loading