Skip to content

WIP: Removed the deprecated iris.fileformats.grib. #2617

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
pelson wants to merge 2 commits into from
Closed

WIP: Removed the deprecated iris.fileformats.grib. #2617

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6f11be2
Removed the deprecated iris.fileformats.grib.
pelson Jun 25, 2017
3b394a4
Further removals.
pelson Jun 25, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions INSTALL
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -119,11 +119,9 @@ gdal 1.9.1 or later (https://pypi.python.org/pypi/GDAL/)
graphviz 2.18 or later (http://www.graphviz.org/)
Graph visualisation software.

grib-api 1.9.16 or later
(https://software.ecmwf.int/wiki/display/GRIB/Releases)
API for the encoding and decoding WMO FM-92 GRIB edition 1 and
edition 2 messages. A compression library such as Jasper is required
to read JPEG2000 compressed GRIB2 files.
iris-grib 0.11 or later
(https://github.com/scitools/iris-grib)
Iris interface to ECMWF's GRIB API

matplotlib 1.2.0 (http://matplotlib.sourceforge.net/)
Python package for 2D plotting.
Expand Down
4 changes: 3 additions & 1 deletion conda-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ imagehash
requests

# Optional iris dependencies
ecmwf_grib
esmpy>=7.0
gdal
libmo_unpack
Expand All @@ -34,3 +33,6 @@ nc_time_axis
pandas
python-stratify
pyugrid

# Iris extensions (i.e. key tools that depend on Iris)
# iris_grib
11 changes: 6 additions & 5 deletions docs/iris/src/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,11 +153,12 @@
modindex_common_prefix = ['iris']

intersphinx_mapping = {
'python': ('http://docs.python.org/2.7', None),
'numpy': ('http://docs.scipy.org/doc/numpy/', None),
'scipy': ('http://docs.scipy.org/doc/scipy/reference/', None),
'matplotlib': ('http://matplotlib.org/', None),
'cartopy': ('http://scitools.org.uk/cartopy/docs/latest/', None),
'cartopy': ('http://scitools.org.uk/cartopy/docs/latest/', None),
'iris-grib': ('http://iris-grib.readthedocs.io/en/latest/', None),
'matplotlib': ('http://matplotlib.org/', None),
'numpy': ('http://docs.scipy.org/doc/numpy/', None),
'python': ('http://docs.python.org/2.7', None),
'scipy': ('http://docs.scipy.org/doc/scipy/reference/', None),
}


Expand Down
6 changes: 3 additions & 3 deletions lib/iris/fileformats/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@
from . import abf
from . import um
try:
from . import grib as igrib
import iris_grib as igrib
except ImportError:
igrib = None

Expand Down Expand Up @@ -72,8 +72,8 @@
#
def _load_grib(*args, **kwargs):
if igrib is None:
raise RuntimeError('Unable to load GRIB file - the ECMWF '
'`gribapi` package is not installed.')
raise RuntimeError('Unable to load GRIB file - '
'`iris_grib` is not installed.')
return igrib.load_cubes(*args, **kwargs)


Expand Down
Loading