Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
E
ewoksdata
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
workflow
ewoksapps
ewoksdata
Commits
98e8cd25
Commit
98e8cd25
authored
1 year ago
by
Wout De Nolf
Browse files
Options
Downloads
Plain Diff
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
!71
improve blissdata version errors
Pipeline
#156581
failed
1 year ago
Stage: test
Stage: style
Stage: build
Stage: test_build
Stage: deploy
Changes
2
Pipelines
7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
setup.cfg
+2
-1
2 additions, 1 deletion
setup.cfg
src/ewoksdata/data/blissdata/__init__.py
+11
-5
11 additions, 5 deletions
src/ewoksdata/data/blissdata/__init__.py
with
13 additions
and
6 deletions
setup.cfg
+
2
−
1
View file @
98e8cd25
...
...
@@ -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
...
...
This diff is collapsed.
Click to expand it.
src/ewoksdata/data/blissdata/__init__.py
+
11
−
5
View file @
98e8cd25
...
...
@@ -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
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment