Merge 1e8500f into bb9590e

holoviews/core/data/__init__.py

@@ -25,16 +25,15 @@
 from .grid import GridInterface
 from .multipath import MultiInterface         # noqa (API import)
 from .image import ImageInterface             # noqa (API import)
-from .spatialpandas import SpatialPandasInterface # noqa (API import)
 
 default_datatype = 'dictionary'
-datatypes = ['dictionary', 'grid', 'spatialpandas']
+datatypes = ['dictionary', 'grid']
 
 try:
     import pandas as pd # noqa (Availability import)
     from .pandas import PandasInterface
     default_datatype = 'dataframe'
-    datatypes = ['dataframe', 'dictionary', 'spatialpandas', 'grid']
+    datatypes.insert(0, 'dataframe')
     DFColumns = PandasInterface
 except ImportError:
     pd = None
@@ -44,14 +43,14 @@
                              'following error: %s' % e)
 
 try:
-    from .xarray import XArrayInterface # noqa (Conditional API import)
-    datatypes.append('xarray')
+    from .spatialpandas import SpatialPandasInterface # noqa (API import)
+    datatypes.append('spatialpandas')
 except ImportError:
     pass
 
 try:
-    from .dask import DaskInterface   # noqa (Conditional API import)
-    datatypes.append('dask')
+    from .xarray import XArrayInterface # noqa (Conditional API import)
+    datatypes.append('xarray')
 except ImportError:
     pass
 
@@ -61,6 +60,12 @@
 except ImportError:
     pass
 
+try:
+    from .dask import DaskInterface   # noqa (Conditional API import)
+    datatypes.append('dask')
+except ImportError:
+    pass
+
 if 'array' not in datatypes:
     datatypes.append('array')
 if 'multitabular' not in datatypes:

holoviews/core/data/spatialpandas.py

@@ -31,7 +31,11 @@ def applies(cls, obj):
         if not cls.loaded():
             return False
         from spatialpandas import GeoDataFrame, GeoSeries
-        return isinstance(obj, (GeoDataFrame, GeoSeries))
+        is_sdf = isinstance(obj, (GeoDataFrame, GeoSeries))
+        if 'geopandas' in sys.modules and not 'geoviews' in sys.modules:
+            import geopandas as gpd
+            is_sdf |= isinstance(obj, (gpd.GeoDataFrame, gpd.GeoSeries))
+        return is_sdf
 
     @classmethod
     def geo_column(cls, data):

setup.py

@@ -10,7 +10,8 @@
 import pyct.build
 
 setup_args = {}
-install_requires = ['param>=1.8.0,<2.0', 'numpy>=1.0', 'pyviz_comms>=0.7.2', 'panel>=0.7.0']
+install_requires = ['param>=1.8.0,<2.0', 'numpy>=1.0', 'pyviz_comms>=0.7.2',
+                    'panel>=0.7.0', 'pandas']
 
 extras_require = {}
 
@@ -19,7 +20,7 @@
 
 # IPython Notebook + pandas + matplotlib + bokeh
 extras_require['recommended'] = extras_require['notebook'] + [
-    'pandas', 'matplotlib>=2.2', 'bokeh>=1.1.0']
+    'matplotlib>=2.2', 'bokeh>=1.1.0']
 
 # Requirements to run all examples
 extras_require['examples'] = extras_require['recommended'] + [