Skip to content
Snippets Groups Projects
Commit 98e8cd25 authored by Wout De Nolf's avatar Wout De Nolf
Browse files

Merge branch 'improve_blissdata_version_errors' into 'main'

improve blissdata version errors

See merge request !71
parents 229b04a9 caeaccc4
No related branches found
No related tags found
1 merge request!71improve blissdata version errors
Pipeline #156581 failed
......@@ -26,7 +26,8 @@ install_requires =
h5py >=2.8
silx >=1.1.0
hdf5plugin
blissdata
blissdata <1.0.1; python_version < "3.8"
blissdata; python_version >= "3.8"
[options.packages.find]
where=src
......
......@@ -5,7 +5,7 @@ try:
from .blissdatav1 import iter_bliss_scan_data_from_memory
from .blissdatav1 import last_lima_image
from blissdata.h5api import dynamic_hdf5
except VersionError:
except VersionError as exc:
try:
# blissdata >0.3.3,<1 (unreleased, branch id31_2.0)
from .blissdatavid31 import iter_bliss_scan_data_from_memory
......@@ -17,14 +17,20 @@ except VersionError:
from .blissdatav0 import iter_bliss_scan_data_from_memory
from .blissdatav0 import last_lima_image
from blissdata.h5api import dynamic_hdf5
except VersionError as exc: # noqa F841
except VersionError: # noqa F841
_EXC = exc
def dynamic_hdf5(*args, **kw):
def _reraise(*_, **kw):
raise _EXC
def iter_bliss_scan_data_from_memory(*args, **kw):
class BlissDataVersionNotSupported:
def __getattr__(self, *_):
return _reraise
dynamic_hdf5 = BlissDataVersionNotSupported()
def iter_bliss_scan_data_from_memory(*_, **kw):
raise _EXC
def last_lima_image(*args, **kw):
def last_lima_image(*_, **kw):
raise _EXC
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment