Skip to content

Commit

Permalink
Removed iris interface (#3054)
Browse files Browse the repository at this point in the history
  • Loading branch information
philippjfr authored Oct 7, 2018
1 parent f329886 commit 8490fb8
Show file tree
Hide file tree
Showing 5 changed files with 3 additions and 647 deletions.
1 change: 0 additions & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ dependencies:
- pyviz/label/dev::param=1.8.0a10
- pyviz::pyviz_comms=0.6.0
- pyviz::datashader
- conda-forge::iris
- conda-forge::netcdf4=1.3.1
- conda-forge::ffmpeg
- conda-forge::flexx=0.4.1
Expand Down
10 changes: 3 additions & 7 deletions examples/user_guide/08-Gridded_Datasets.ipynb
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
"metadata": {},
"outputs": [],
"source": [
"import xarray as xr\n",
"import numpy as np\n",
"import holoviews as hv\n",
"hv.extension('matplotlib')\n",
Expand Down Expand Up @@ -67,7 +66,7 @@
"cell_type": "markdown",
"metadata": {},
"source": [
"However HoloViews also ships with interfaces for ``xarray`` and ``iris``, two common libraries for working with multi-dimensional datasets:"
"However HoloViews also ships with an interface for ``xarray`` and the [GeoViews](https://geoviews.org) library ships with an interface for ``iris`` objects, which are two common libraries for working with multi-dimensional datasets:"
]
},
{
Expand All @@ -81,13 +80,10 @@
"\n",
"try: \n",
" xr_img = img.clone(datatype=['xarray'])\n",
" iris_img = img.clone(datatype=['cube'])\n",
"\n",
" print(type(xr_img.data))\n",
" print(type(iris_img.data))\n",
" \n",
" print(type(xr_img.data)) \n",
"except:\n",
" print('One of the following data backend cannot be imported: xarray or iris')"
" print('xarray interface could not be imported.')"
]
},
{
Expand Down
10 changes: 0 additions & 10 deletions holoviews/core/data/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,6 @@
param.main.warning('Pandas interface failed to import with '
'following error: %s' % e)

try:
import iris # noqa (Availability import)
from .iris import CubeInterface # noqa (Conditional API import)
datatypes.append('cube')
except ImportError:
pass
except Exception as e:
param.main.warning('Iris interface failed to import with '
'following error: %s' % e)

try:
import xarray # noqa (Availability import)
from .xarray import XArrayInterface # noqa (Conditional API import)
Expand Down
Loading

0 comments on commit 8490fb8

Please sign in to comment.