Don't crash if dask import fails

JelleAalbers · Dec 19, 2016 · ed8c97c · ed8c97c
1 parent 44aabe7
commit ed8c97c
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 0.5.0
+current_version = 0.5.1
 files = setup.py multihist.py
 commit = True
 tag = True

diff --git a/multihist.py b/multihist.py
@@ -25,7 +25,7 @@
     WE_HAVE_DASK = True
     DEFAULT_DASK_COMPUTE_KWARGS = dict(get=dask.multiprocessing.get)
     COLUMNAR_DATA_SOURCES.append(dask.dataframe.DataFrame)
-except ImportError:
+except Exception:           # Sometimes dask import succeeds, but throws error when starting up
     WE_HAVE_DASK = False
     pass
 
@@ -39,7 +39,7 @@
 
 from operator import itemgetter
 
-__version__ = '0.5.0'
+__version__ = '0.5.1'
 
 
 class CoordinateOutOfRangeException(Exception):

diff --git a/setup.py b/setup.py
@@ -9,7 +9,7 @@
 test_requirements = requirements + ['flake8', 'pandas']
 
 setup(name='multihist',
-      version='0.5.0',
+      version='0.5.1',
       description='Convenience wrappers around numpy histograms',
       long_description=readme + '\n\n' + history,
       author='Jelle Aalbers',