Merge branch 'development' of magit1.mpie.de:damask/DAMASK into development

2016-10-14 10:45:57 -04:00 · 2016-10-14 10:45:57 -04:00 · e9ff0a2434
parent e5e2eef375 81ada5ffde
commit e9ff0a2434
2 changed files with 5 additions and 2 deletions
--- a/2
+++ b/2
@ -1 +1 @@
-v2.0.1-201-g7278605
+v2.0.1-213-g75149cc
--- a/lib/damask/init.py
+++ b/lib/damask/init.py
@ -8,7 +8,10 @@ with open(os.path.join(os.path.dirname(__file__),'../../VERSION')) as f:

 from .environment import Environment      # noqa
 from .asciitable  import ASCIItable       # noqa
-from .h5table     import H5Table          # noqa
+try:
+  from .h5table     import H5Table        # noqa
+except ImportError:
+  print("h5py module not found")
 from .config      import Material         # noqa
 from .colormaps   import Colormap, Color  # noqa
 from .orientation import Quaternion, Rodrigues, Symmetry, Orientation # noqa