Skip to content

Commit

Permalink
Fix build (#632)
Browse files Browse the repository at this point in the history
  • Loading branch information
hoxbro authored Apr 29, 2023
1 parent 4a0ebbb commit 4700e9c
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 5 deletions.
8 changes: 6 additions & 2 deletions geoviews/operation/projection.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,11 @@

import param
import numpy as np
import pandas as pd

from cartopy import crs as ccrs
from cartopy.img_transform import warp_array, _determine_bounds
from holoviews.core.data import MultiInterface
from holoviews.core.util import cartesian_product, get_param_values, pd
from holoviews.core.util import cartesian_product, get_param_values
from holoviews.operation import Operation
from shapely.geometry import Polygon, MultiPolygon
from shapely.geometry.collection import GeometryCollection
Expand Down Expand Up @@ -327,6 +327,8 @@ class project_image(_project_operation):
supported_types = [Image, RGB]

def _process(self, img, key=None):
from cartopy.img_transform import warp_array

if self.p.fast:
return self._fast_process(img, key)

Expand Down Expand Up @@ -367,6 +369,8 @@ def _process(self, img, key=None):
ydensity=None)

def _fast_process(self, element, key=None):
from cartopy.img_transform import _determine_bounds

# Project coordinates
proj = self.p.projection
if proj == element.crs:
Expand Down
2 changes: 1 addition & 1 deletion geoviews/tests/data/test_geopandas.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
from unittest import SkipTest

import numpy as np
import pandas as pd

from shapely import geometry as sgeom

Expand All @@ -13,7 +14,6 @@
except ImportError:
geopandas = None

from holoviews.core.util import pd
from holoviews.core.data import Dataset
from holoviews.core.data.interface import DataError
from holoviews.element import Polygons, Path, Points
Expand Down
2 changes: 1 addition & 1 deletion geoviews/tests/data/test_multigeometry.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,10 @@
from unittest import SkipTest

import numpy as np
import pandas as pd

from holoviews.core.data import Dataset, MultiInterface
from holoviews.core.data.interface import DataError
from holoviews.core.util import pd
from holoviews.element import Polygons, Path
from holoviews.element.comparison import ComparisonTestCase
from holoviews.tests.core.data.test_multiinterface import MultiBaseInterfaceTest
Expand Down
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,7 @@ def run(self):
'numpy',
'shapely',
'param',
'panel',
'panel >=1.0.0rc1',
'pyproj',
]

Expand Down

0 comments on commit 4700e9c

Please sign in to comment.