diff options
| author | Picca Frédéric-Emmanuel <picca@synchrotron-soleil.fr> | 2019-05-28 08:16:16 +0200 |
|---|---|---|
| committer | Picca Frédéric-Emmanuel <picca@synchrotron-soleil.fr> | 2019-05-28 08:16:16 +0200 |
| commit | a763e5d1b3921b3194f3d4e94ab9de3fbe08bbdd (patch) | |
| tree | 45d462ed36a5522e9f3b9fde6c4ec4918c2ae8e3 /silx/io/test/test_nxdata.py | |
| parent | cebdc9244c019224846cb8d2668080fe386a6adc (diff) | |
New upstream version 0.10.1+dfsg
Diffstat (limited to 'silx/io/test/test_nxdata.py')
| -rw-r--r-- | silx/io/test/test_nxdata.py | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/silx/io/test/test_nxdata.py b/silx/io/test/test_nxdata.py index fab71dc..a790e36 100644 --- a/silx/io/test/test_nxdata.py +++ b/silx/io/test/test_nxdata.py @@ -27,21 +27,19 @@ __authors__ = ["P. Knobel"] __license__ = "MIT" __date__ = "27/01/2018" -try: - import h5py -except ImportError: - h5py = None -import numpy + import tempfile import unittest +import h5py +import numpy +import six + from .. import nxdata -from silx.third_party import six text_dtype = h5py.special_dtype(vlen=six.text_type) -@unittest.skipIf(h5py is None, "silx.io.nxdata tests depend on h5py") class TestNXdata(unittest.TestCase): def setUp(self): tmp = tempfile.NamedTemporaryFile(prefix="nxdata_examples_", suffix=".h5", delete=True) @@ -358,7 +356,6 @@ class TestNXdata(unittest.TestCase): self.assertIsNone(nxd.interpretation) -@unittest.skipIf(h5py is None, "silx.io.nxdata tests depend on h5py") class TestLegacyNXdata(unittest.TestCase): def setUp(self): tmp = tempfile.NamedTemporaryFile(prefix="nxdata_legacy_examples_", |