Skip to content

Commit

Permalink
Install spatialpandas
Browse files Browse the repository at this point in the history
  • Loading branch information
philippjfr committed Dec 19, 2019
1 parent c501f7c commit c8e47c1
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 2 deletions.
4 changes: 2 additions & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ os:
env:
global:
- PYENV_VERSION=3.7
- PYTHON_VERSION=3.6
- PKG_TEST_PYTHON="--test-python=py36 --test-python=py27"
- PYTHON_VERSION=3.7
- PKG_TEST_PYTHON="--test-python=py37 --test-python=py27"
- CHANS_DEV="-c pyviz/label/dev"
- CHANS_REL="-c pyviz"
- LABELS_DEV="--label dev"
Expand Down
10 changes: 10 additions & 0 deletions geoviews/tests/data/testmultigeominterface.py
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,11 @@
except:
sgeom = None

try:
import spatialpandas
except:
spatialpandas = None

from geoviews.data.geom_dict import GeomDictInterface


Expand Down Expand Up @@ -130,6 +135,11 @@ class SpatialPandasGeomInterfaceTest(GeomInterfaceTest):

__test__ = True

def setUp(self):
if spatialpandas is None:
raise SkipTest('SpatialPandasInterface requires spatialpandas, skipping tests')
super(SpatialPandasGeomInterfaceTest, self).setUp()


class MultiGeomDictInterfaceTest(MultiBaseInterfaceTest):

Expand Down
3 changes: 3 additions & 0 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,9 @@ def package_assets(example_path):
'xarray',
]

if sys.version_info.major > 2:
extras_require['examples'].append('spatialpandas')

# can only currently run all examples with packages from conda-forge
_examples_extra = _recommended + [
'iris',
Expand Down

0 comments on commit c8e47c1

Please sign in to comment.