Skip to content

Commit b512157

Browse files
authored
Merge pull request #388 from SylvainCorlay/optional-geopandas
Make geopandas an optional dependency
2 parents 048ea57 + dc6e390 commit b512157

File tree

2 files changed

+2
-5
lines changed

2 files changed

+2
-5
lines changed

ipyleaflet/leaflet.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818

1919
from traittypes import Dataset
2020

21-
from geopandas import GeoDataFrame
22-
2321
from .xarray_ds import ds_x_to_json
2422

2523
from .basemaps import basemaps
@@ -511,7 +509,7 @@ def on_hover(self, callback, remove=False):
511509

512510
class GeoData(GeoJSON):
513511

514-
geo_dataframe = Instance(GeoDataFrame)
512+
geo_dataframe = Instance('geopandas.GeoDataFrame')
515513

516514
def __init__(self, **kwargs):
517515
super(GeoJSON, self).__init__(**kwargs)

setup.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -137,8 +137,7 @@ def run(self):
137137
'ipywidgets>=7.0.0,<8',
138138
'traittypes>=0.2.1,<3',
139139
'xarray>=0.10',
140-
'branca>=0.3.1,<0.4',
141-
'geopandas>=0.5.0',
140+
'branca>=0.3.1,<0.4'
142141
],
143142
'packages': find_packages(),
144143
'zip_safe': False,

0 commit comments

Comments
 (0)