Skip to content

Unskipdask #58

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
wants to merge 11 commits into
base: dask
Choose a base branch
from
Open

Unskipdask #58

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
eec33fd
functional code transfer
marqh Apr 4, 2017
c2f7034
bring in unit tests
marqh Apr 4, 2017
6c5ecec
minimal GRIB integration test alterations
marqh Apr 4, 2017
e6f6959
remove IrisGribTest
marqh Apr 4, 2017
203a482
remove grib version string
marqh Apr 4, 2017
6e5e2de
manage conditional imports
marqh Apr 4, 2017
030f58f
review points
marqh Apr 5, 2017
a4a5416
Add biggus test skippers
lbdreyer Apr 6, 2017
f03eeec
Daskify grib loading/saving and completely remove biggus.
lbdreyer Apr 6, 2017
80a8dc7
Add biggus test skipper to other error-ing tests.
lbdreyer Apr 6, 2017
dd64590
do not skip biggus
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
1 change: 0 additions & 1 deletion conda-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# conda create -n <name> --file conda-requirements.txt

# Mandatory dependencies
biggus
cartopy
matplotlib
netcdf4
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