Skip to content

Eccodestransfer #57

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

Open
marqh wants to merge 11 commits into
base: master
Choose a base branch
from
Open

Eccodestransfer #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
67f171e
functional code transfer
marqh Apr 4, 2017
bf6b266
bring in unit tests
marqh Apr 4, 2017
8de4c5a
minimal GRIB integration test alterations
marqh Apr 4, 2017
d66ee0f
remove IrisGribTest
marqh Apr 4, 2017
a59d10b
remove grib version string
marqh Apr 4, 2017
9a9f202
manage conditional imports
marqh Apr 4, 2017
ae8bfef
review points
marqh Apr 5, 2017
ac61747
adopt eccodes
marqh Apr 6, 2017
a5ee0bc
alter _MDI value
marqh Apr 6, 2017
8aa78d7
re-establish grib skipper
marqh Apr 6, 2017
8c2a627
code standard
marqh Apr 6, 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
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ install:
conda install --quiet --file minimal-conda-requirements.txt;
else
if [[ "$TRAVIS_PYTHON_VERSION" == 3* ]]; then
sed -e '/ecmwf_grib/d' -e '/esmpy/d' -e '/iris-grib/d' -e 's/#.\+$//' conda-requirements.txt | xargs conda install --quiet;
sed -e '/esmpy/d' -e 's/#.\+$//' conda-requirements.txt | xargs conda install --quiet;
else
conda install --quiet --file conda-requirements.txt;
fi
Expand Down
2 changes: 1 addition & 1 deletion conda-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ requests

# Optional iris dependencies
nc_time_axis
iris-grib
python-eccodes
esmpy>=7.0
gdal
libmo_unpack
Expand Down
10 changes: 4 additions & 6 deletions lib/iris/fileformats/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# (C) British Crown Copyright 2010 - 2016, Met Office
# (C) British Crown Copyright 2010 - 2017, Met Office
#
# This file is part of Iris.
#
Expand Down Expand Up @@ -27,13 +27,11 @@
UriProtocol, LeadingLine)
from . import abf
from . import um

try:
import iris_grib as igrib
from . import grib as igrib
except ImportError:
try:
from . import grib as igrib
except ImportError:
igrib = None
igrib = None

from . import name
from . import netcdf
Expand Down
Loading