mosca 2.0.5__tar.gz → 2.0.8__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {mosca-2.0.5 → mosca-2.0.8}/PKG-INFO +1 -1
- {mosca-2.0.5 → mosca-2.0.8}/pyproject.toml +73 -12
- mosca-2.0.8/src/mosca/__init__.py +5 -0
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/common/enums.py +1 -3
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/common/logger.py +5 -19
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/common/threads.py +15 -69
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/common/utils.py +35 -0
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/control/buffer.py +95 -179
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/control/controller.py +1 -1
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/control/datahandler.py +26 -31
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/control/detectors.py +3 -8
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/control/mosca.py +53 -121
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/control/shared.py +0 -1
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/control/spectra.py +2 -9
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/control/stats.py +2 -8
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/control/tasks/background.py +1 -3
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/control/tasks/rois.py +20 -38
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/control/tasks/saving.py +19 -56
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/control/tasks/task.py +4 -32
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/control/tasks/taskmanager.py +2 -43
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/devices/__init__.py +3 -0
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/devices/hamamatsu/hamamatsu.py +1 -9
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/devices/hamamatsu/hamamatsuhw.py +27 -164
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/devices/oceanoptics/oceanopticshw.py +12 -15
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/devices/simulation/dante/simdante.py +0 -3
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/devices/simulation/dante/simdantehw.py +15 -58
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/devices/simulation/dummy/dummy.py +3 -32
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/devices/simulation/generator.py +23 -38
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/devices/simulation/xia/iniparser.py +2 -2
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/devices/simulation/xia/simfalconx.py +0 -1
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/devices/simulation/xia/simfalconxhw.py +60 -146
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/devices/xglab/dante.py +5 -23
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/devices/xglab/dantehw.py +28 -184
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/devices/xia/falconx.py +26 -113
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/devices/xia/handel/_cffi.py +1 -1
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/devices/xia/handel/interface.py +40 -114
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/devices/xia/mercury.py +15 -42
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/devices/xia/xia.py +66 -28
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/devices/xia/xiads.py +19 -18
- mosca-2.0.8/src/mosca/devices/xia/xmap.py +103 -0
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/rpc/mosca.py +10 -29
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/rpc/server.py +6 -5
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/rpc/tasks/background.py +2 -7
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/rpc/tasks/saving.py +2 -6
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/rpc/utils.py +10 -0
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/tango/controller.py +36 -21
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/tango/main.py +21 -43
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/tango/mosca.py +37 -101
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/tango/moscav1.py +24 -81
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/tango/tasks/background.py +1 -2
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/tango/tasks/saving.py +4 -18
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/tango/utils.py +23 -58
- mosca-2.0.5/.gitlab-ci.yml +0 -155
- mosca-2.0.5/conda/meta.yaml +0 -79
- mosca-2.0.5/doc/docs/bliss.md +0 -9
- mosca-2.0.5/doc/docs/controllers.md +0 -2
- mosca-2.0.5/doc/docs/devel/buffer.md +0 -4
- mosca-2.0.5/doc/docs/devel/controller.md +0 -11
- mosca-2.0.5/doc/docs/devel/mosca.md +0 -7
- mosca-2.0.5/doc/docs/devel/overview.md +0 -132
- mosca-2.0.5/doc/docs/devel/tasks/background.md +0 -4
- mosca-2.0.5/doc/docs/hamamatsu.md +0 -100
- mosca-2.0.5/doc/docs/img/mosca.avif +0 -0
- mosca-2.0.5/doc/docs/img/mosca.ico +0 -0
- mosca-2.0.5/doc/docs/img/mosca1.png +0 -0
- mosca-2.0.5/doc/docs/img/mosca2.png +0 -0
- mosca-2.0.5/doc/docs/img/oo_hw_edge_trig.png +0 -0
- mosca-2.0.5/doc/docs/index.md +0 -35
- mosca-2.0.5/doc/docs/install.md +0 -15
- mosca-2.0.5/doc/docs/mosca.md +0 -50
- mosca-2.0.5/doc/docs/oceanoptics.md +0 -71
- mosca-2.0.5/doc/docs/quickstart.md +0 -222
- mosca-2.0.5/doc/docs/simulators.md +0 -20
- mosca-2.0.5/doc/docs/tasks/background.md +0 -16
- mosca-2.0.5/doc/docs/tasks/overview.md +0 -30
- mosca-2.0.5/doc/docs/tasks/rois.md +0 -1
- mosca-2.0.5/doc/docs/tasks/spectrasum.md +0 -1
- mosca-2.0.5/doc/docs/xglab.md +0 -60
- mosca-2.0.5/doc/docs/xia.md +0 -167
- mosca-2.0.5/doc/mkdocs.yml +0 -106
- mosca-2.0.5/doc/src/wavedrom/oo_hw_edge_trig.txt +0 -9
- mosca-2.0.5/doc/theme/bliss_logo_small.svg +0 -636
- mosca-2.0.5/packages/bliss_mosca/README.rst +0 -5
- mosca-2.0.5/packages/bliss_mosca/pyproject.toml +0 -28
- mosca-2.0.5/packages/bliss_mosca/src/bliss_mosca/__init__.py +0 -9
- mosca-2.0.5/packages/bliss_mosca/src/bliss_mosca/base.py +0 -1105
- mosca-2.0.5/packages/bliss_mosca/src/bliss_mosca/calccounters.py +0 -426
- mosca-2.0.5/packages/bliss_mosca/src/bliss_mosca/channel.py +0 -96
- mosca-2.0.5/packages/bliss_mosca/src/bliss_mosca/compat.py +0 -24
- mosca-2.0.5/packages/bliss_mosca/src/bliss_mosca/counters.py +0 -174
- mosca-2.0.5/packages/bliss_mosca/src/bliss_mosca/simulation/generator.py +0 -221
- mosca-2.0.5/packages/bliss_mosca/src/bliss_mosca/simulation/moscans.py +0 -228
- mosca-2.0.5/packages/blissdata_mosca/README.rst +0 -4
- mosca-2.0.5/packages/blissdata_mosca/pyproject.toml +0 -31
- mosca-2.0.5/packages/blissdata_mosca/src/blissdata_mosca/__init__.py +0 -4
- mosca-2.0.5/packages/blissdata_mosca/src/blissdata_mosca/stream.py +0 -268
- mosca-2.0.5/packages/mosca_client/README.rst +0 -4
- mosca-2.0.5/packages/mosca_client/pyproject.toml +0 -28
- mosca-2.0.5/packages/mosca_client/src/mosca_client/logging.py +0 -111
- mosca-2.0.5/packages/mosca_client/src/mosca_client/tango/devices/dante.py +0 -121
- mosca-2.0.5/packages/mosca_client/src/mosca_client/tango/devices/danteplus.py +0 -8
- mosca-2.0.5/packages/mosca_client/src/mosca_client/tango/devices/dummy.py +0 -9
- mosca-2.0.5/packages/mosca_client/src/mosca_client/tango/devices/falconx.py +0 -66
- mosca-2.0.5/packages/mosca_client/src/mosca_client/tango/devices/generator.py +0 -58
- mosca-2.0.5/packages/mosca_client/src/mosca_client/tango/devices/simdante.py +0 -9
- mosca-2.0.5/packages/mosca_client/src/mosca_client/tango/devices/simfalconx.py +0 -9
- mosca-2.0.5/packages/mosca_client/src/mosca_client/tango/devices/simulation.py +0 -18
- mosca-2.0.5/packages/mosca_client/src/mosca_client/tango/devices/xia.py +0 -56
- mosca-2.0.5/packages/mosca_client/src/mosca_client/tango/mca.py +0 -110
- mosca-2.0.5/packages/mosca_client/src/mosca_client/tango/mosca.py +0 -367
- mosca-2.0.5/packages/mosca_client/src/mosca_client/tango/readers.py +0 -564
- mosca-2.0.5/packages/mosca_client/src/mosca_client/tango/rois.py +0 -262
- mosca-2.0.5/packages/mosca_client/src/mosca_client/tango/saving.py +0 -263
- mosca-2.0.5/packages/mosca_client/src/mosca_client/tango/utils.py +0 -96
- mosca-2.0.5/scripts/mosca.ps1 +0 -7
- mosca-2.0.5/setup.cfg +0 -12
- mosca-2.0.5/src/mosca/__init__.py +0 -11
- mosca-2.0.5/src/mosca/control/tasks/__init__.py +0 -3
- mosca-2.0.5/src/mosca/control/tasks/spectrasums.py +0 -185
- mosca-2.0.5/src/mosca/devices/xia/utils.py +0 -47
- mosca-2.0.5/src/mosca/rpc/__init__.py +0 -0
- mosca-2.0.5/src/mosca/rpc/tasks/__init__.py +0 -0
- mosca-2.0.5/src/mosca/tango/tasks/__init__.py +0 -0
- mosca-2.0.5/tests/__init__.py +0 -0
- mosca-2.0.5/tests/bliss/__init__.py +0 -0
- mosca-2.0.5/tests/bliss/bliss_utils.py +0 -20
- mosca-2.0.5/tests/bliss/conftest.py +0 -329
- mosca-2.0.5/tests/bliss/test_calcformula.py +0 -329
- mosca-2.0.5/tests/bliss/test_hdf5.py +0 -209
- mosca-2.0.5/tests/bliss/test_mosca.py +0 -87
- mosca-2.0.5/tests/bliss/test_moscastream.py +0 -57
- mosca-2.0.5/tests/bliss/test_simdante.py +0 -243
- mosca-2.0.5/tests/bliss/test_simfalconx.py +0 -1395
- mosca-2.0.5/tests/bliss/utils.py +0 -44
- mosca-2.0.5/tests/bliss/v1/__init__.py +0 -0
- mosca-2.0.5/tests/bliss/v1/test_calcformula_v1.py +0 -95
- mosca-2.0.5/tests/bliss/v1/test_dummy_v1.py +0 -10
- mosca-2.0.5/tests/bliss/v1/test_hdf5.py +0 -150
- mosca-2.0.5/tests/bliss/v1/test_moscav1.py +0 -779
- mosca-2.0.5/tests/bliss/v1/test_simfx_v1.py +0 -1206
- mosca-2.0.5/tests/conftest.py +0 -298
- mosca-2.0.5/tests/data/beacon/__init__.yml +0 -20
- mosca-2.0.5/tests/data/beacon/mosca/counters.yml +0 -17
- mosca-2.0.5/tests/data/beacon/mosca/dummy.yml +0 -11
- mosca-2.0.5/tests/data/beacon/mosca/simdante.yml +0 -24
- mosca-2.0.5/tests/data/beacon/mosca/simfx.yml +0 -63
- mosca-2.0.5/tests/data/beacon/sessions/__init__.yml +0 -1
- mosca-2.0.5/tests/data/beacon/sessions/session_simfx_w_counters_setup.py +0 -0
- mosca-2.0.5/tests/data/beacon/sessions/session_simfx_with_counters.yml +0 -15
- mosca-2.0.5/tests/data/beacon/sessions/test_dummy.yml +0 -5
- mosca-2.0.5/tests/data/beacon/sessions/test_dummy_setup.py +0 -0
- mosca-2.0.5/tests/data/beacon/sessions/test_dummy_v1.yml +0 -5
- mosca-2.0.5/tests/data/beacon/sessions/test_dummy_v1_setup.py +0 -0
- mosca-2.0.5/tests/data/beacon/sessions/test_simdante.yml +0 -5
- mosca-2.0.5/tests/data/beacon/sessions/test_simdante_setup.py +0 -0
- mosca-2.0.5/tests/data/beacon/sessions/test_simdante_v1.yml +0 -5
- mosca-2.0.5/tests/data/beacon/sessions/test_simdante_v1_setup.py +0 -0
- mosca-2.0.5/tests/data/beacon/sessions/test_simfx.yml +0 -5
- mosca-2.0.5/tests/data/beacon/sessions/test_simfx_setup.py +0 -0
- mosca-2.0.5/tests/data/beacon/sessions/test_simfx_v1.yml +0 -5
- mosca-2.0.5/tests/data/beacon/sessions/test_simfx_v1_setup.py +0 -0
- mosca-2.0.5/tests/data/beacon/tango/__init__.py +0 -0
- mosca-2.0.5/tests/data/beacon/tango/nexus_writer.yml +0 -8
- mosca-2.0.5/tests/data/dante/dante_16ch.hdf +0 -0
- mosca-2.0.5/tests/data/dante/dante_1ch.hdf +0 -0
- mosca-2.0.5/tests/data/falconx/falconx.ini +0 -86
- mosca-2.0.5/tests/data/falconx/falconx_18ch.ini +0 -938
- mosca-2.0.5/tests/data/falconx/falconx_1ch.ini +0 -86
- mosca-2.0.5/tests/data/falconx/falconx_2ch.ini +0 -136
- mosca-2.0.5/tests/data/falconx/falconx_6ch.ini +0 -342
- mosca-2.0.5/tests/mosca/__init__.py +0 -0
- mosca-2.0.5/tests/mosca/control/__init__.py +0 -0
- mosca-2.0.5/tests/mosca/control/common.py +0 -80
- mosca-2.0.5/tests/mosca/control/tasks/__init__.py +0 -0
- mosca-2.0.5/tests/mosca/control/tasks/test_rois.py +0 -524
- mosca-2.0.5/tests/mosca/control/tasks/test_tasks.py +0 -32
- mosca-2.0.5/tests/mosca/control/tasks/test_writer.py +0 -0
- mosca-2.0.5/tests/mosca/control/test_buffer.py +0 -258
- mosca-2.0.5/tests/mosca/control/test_datahandler.py +0 -152
- mosca-2.0.5/tests/mosca/rpc/__init__.py +0 -0
- mosca-2.0.5/tests/mosca/rpc/conftest.py +0 -73
- mosca-2.0.5/tests/mosca/rpc/test_rpc_server.py +0 -81
- mosca-2.0.5/tests/mosca/tango/__init__.py +0 -0
- mosca-2.0.5/tests/mosca/tango/devices/__init__.py +0 -0
- mosca-2.0.5/tests/mosca/tango/devices/test_simdante.py +0 -260
- mosca-2.0.5/tests/mosca/tango/devices/test_simfalconx.py +0 -420
- mosca-2.0.5/tests/mosca/tango/test_mosca.py +0 -227
- mosca-2.0.5/tests/mosca/tango/test_rois.py +0 -349
- mosca-2.0.5/tests/perf/test_writer.py +0 -89
- {mosca-2.0.5 → mosca-2.0.8}/.gitignore +0 -0
- {mosca-2.0.5 → mosca-2.0.8}/LICENSE +0 -0
- {mosca-2.0.5 → mosca-2.0.8}/README.rst +0 -0
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/common/__init__.py +0 -0
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/control/__init__.py +0 -0
- {mosca-2.0.5/packages/bliss_mosca/src/bliss_mosca/simulation → mosca-2.0.8/src/mosca/control/tasks}/__init__.py +0 -0
- {mosca-2.0.5/packages/mosca_client/src/mosca_client → mosca-2.0.8/src/mosca/devices/hamamatsu}/__init__.py +0 -0
- {mosca-2.0.5/packages/mosca_client/src/mosca_client/tango → mosca-2.0.8/src/mosca/devices/oceanoptics}/__init__.py +0 -0
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/devices/oceanoptics/oceanoptics.py +0 -0
- {mosca-2.0.5/packages/mosca_client/src/mosca_client/tango/devices → mosca-2.0.8/src/mosca/devices/simulation}/__init__.py +0 -0
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/devices/simulation/dante/__init__.py +0 -0
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/devices/simulation/dummy/__init__.py +0 -0
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/devices/simulation/xia/__init__.py +0 -0
- {mosca-2.0.5/src/mosca/devices/hamamatsu → mosca-2.0.8/src/mosca/devices/xglab}/__init__.py +0 -0
- {mosca-2.0.5/src/mosca/devices/oceanoptics → mosca-2.0.8/src/mosca/devices/xia}/__init__.py +0 -0
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/devices/xia/handel/__init__.py +0 -0
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/devices/xia/handel/error.py +0 -0
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/devices/xia/handel/handel_inc/handel_constants.h +0 -0
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/devices/xia/handel/handel_inc/handel_errors.h +0 -0
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/devices/xia/handel/handel_inc/handel_generic.h +0 -0
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/devices/xia/handel/mapping.py +0 -0
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/devices/xia/handel/stats.py +0 -0
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/mosca.py +0 -0
- {mosca-2.0.5/src/mosca/devices/simulation → mosca-2.0.8/src/mosca/rpc}/__init__.py +0 -0
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/rpc/devices.py +0 -0
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/rpc/main.py +0 -0
- {mosca-2.0.5/src/mosca/devices/xglab → mosca-2.0.8/src/mosca/rpc/tasks}/__init__.py +0 -0
- {mosca-2.0.5 → mosca-2.0.8}/src/mosca/tango/__init__.py +0 -0
- {mosca-2.0.5/src/mosca/devices/xia → mosca-2.0.8/src/mosca/tango/tasks}/__init__.py +0 -0
|
@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
|
|
|
4
4
|
|
|
5
5
|
[project]
|
|
6
6
|
name = "mosca"
|
|
7
|
-
version = "2.0.
|
|
7
|
+
version = "2.0.8"
|
|
8
8
|
description = "A library for the unified control of MCA detectors"
|
|
9
9
|
readme = "README.rst"
|
|
10
10
|
authors = [
|
|
@@ -44,6 +44,10 @@ mosca-rpc = "mosca.rpc.main:main"
|
|
|
44
44
|
"Homepage" = "https://gitlab.esrf.fr/bliss/mosca"
|
|
45
45
|
"Bug Tracker" = "https://gitlab.esrf.fr/bliss/mosca/issues"
|
|
46
46
|
|
|
47
|
+
[tool.hatch.build.targets.sdist]
|
|
48
|
+
# by default hatchling ships the whole repository (tests, doc, packages/...)
|
|
49
|
+
include = ["/src/mosca", "/README.rst", "/LICENSE"]
|
|
50
|
+
|
|
47
51
|
[tool.coverage.run]
|
|
48
52
|
patch = ["subprocess", "_exit"]
|
|
49
53
|
parallel = true
|
|
@@ -58,6 +62,11 @@ omit = [
|
|
|
58
62
|
"*/sessions/test_simfx_setup.py",
|
|
59
63
|
]
|
|
60
64
|
|
|
65
|
+
[tool.pytest.ini_options]
|
|
66
|
+
# per-test (incl. fixtures) safety net: a hang fails that test with a stack
|
|
67
|
+
# dump instead of silently running into the CI job timeout
|
|
68
|
+
timeout = 300
|
|
69
|
+
|
|
61
70
|
[tool.pylint.messages_control]
|
|
62
71
|
disable = [
|
|
63
72
|
"R0914", # too-many-locals
|
|
@@ -74,7 +83,7 @@ preview = ["pixi-build"]
|
|
|
74
83
|
#umodbus = ">=1.0.2.1,<2"
|
|
75
84
|
|
|
76
85
|
[tool.pixi.package]
|
|
77
|
-
name = "mosca
|
|
86
|
+
name = "mosca"
|
|
78
87
|
|
|
79
88
|
[tool.pixi.package.build]
|
|
80
89
|
backend = { name = "pixi-build-python", version = "0.*" }
|
|
@@ -88,6 +97,7 @@ hatchling = "==1.26.3"
|
|
|
88
97
|
|
|
89
98
|
[tool.pixi.feature.test.pypi-dependencies]
|
|
90
99
|
pytest = "<9.1"
|
|
100
|
+
pytest-timeout = "*"
|
|
91
101
|
coverage = "*"
|
|
92
102
|
nosqltangodb = "==1.0.6" # for beacon
|
|
93
103
|
build = ">=1.6.1, <2"
|
|
@@ -102,15 +112,18 @@ blissdata_mosca = { path = "packages/blissdata_mosca", editable = true }
|
|
|
102
112
|
bliss_mosca = { path = "packages/bliss_mosca", editable = true }
|
|
103
113
|
|
|
104
114
|
[tool.pixi.feature.blissdep.dependencies]
|
|
115
|
+
# generated by scripts/sync_blissdep.py from https://gitlab.esrf.fr/bliss/bliss/-/raw/2.4.x/conda-requirements.txt
|
|
116
|
+
python = ">=3.11"
|
|
105
117
|
graphviz = "*"
|
|
106
118
|
hkl = ">=5.0.0"
|
|
107
119
|
pyopengl = "==3.1.5" # see https://github.com/mcfletch/pyopengl/issues/88
|
|
108
120
|
pyqt = ">=5.12"
|
|
109
|
-
redis-server = "7
|
|
121
|
+
redis-server = ">=7"
|
|
110
122
|
redisearch = ">=2.6.5"
|
|
111
123
|
redisjson = ">=2.4.5"
|
|
112
124
|
tailon = ">=1.1.0"
|
|
113
125
|
tmux = ">=3.4,<=3.5" # 3.6 is unstable see https://github.com/tmux/tmux/issues/4710
|
|
126
|
+
cxx-compiler = "*" # to build wheels with c-extensions (pymca)
|
|
114
127
|
|
|
115
128
|
[tool.pixi.feature.bliss.pypi-dependencies]
|
|
116
129
|
bliss = { git = "https://gitlab.esrf.fr/bliss/bliss.git", branch="2.4.x" }
|
|
@@ -136,6 +149,11 @@ flint = { git = "https://gitlab.esrf.fr/bliss/bliss.git", branch="4921-mosca-cli
|
|
|
136
149
|
#zarr = "*"
|
|
137
150
|
#s3fs = "*"
|
|
138
151
|
|
|
152
|
+
[tool.pixi.feature.blisswriter.pypi-dependencies]
|
|
153
|
+
blisswriter = { version = "*", extras = ["tango"] }
|
|
154
|
+
mosca_client = { path = "packages/mosca_client", editable = true }
|
|
155
|
+
blissdata_mosca = { path = "packages/blissdata_mosca", editable = true }
|
|
156
|
+
|
|
139
157
|
[tool.pixi.feature.rpc.pypi-dependencies]
|
|
140
158
|
# alternative, non-Tango transport for the control layer
|
|
141
159
|
zerorpc = "*"
|
|
@@ -150,7 +168,8 @@ zerorpc = "*"
|
|
|
150
168
|
|
|
151
169
|
[tool.pixi.environments]
|
|
152
170
|
server = ["server"]
|
|
153
|
-
bliss = ["bliss_mosca", "bliss"]
|
|
171
|
+
bliss = ["bliss_mosca", "bliss", "blissdep"]
|
|
172
|
+
blisswriter = ["blisswriter"]
|
|
154
173
|
testserver = ["test", "server"]
|
|
155
174
|
testblissmosca = ["test", "server", "bliss_mosca", "bliss", "blissdep"]
|
|
156
175
|
testbliss = ["test", "server", "bliss", "blissdep"]
|
|
@@ -159,9 +178,12 @@ testblissmosca23 = ["test", "server", "bliss_mosca", "bliss23", "blissdep"]
|
|
|
159
178
|
#testserverzarr = ["test", "server", "zarr"]
|
|
160
179
|
#testblisszarr = ["test", "server", "bliss_mosca", "zarr", "blisszarr", "blissdep"]
|
|
161
180
|
|
|
162
|
-
[tool.pixi.tasks]
|
|
163
|
-
|
|
164
|
-
|
|
181
|
+
[tool.pixi.tasks.cov_server]
|
|
182
|
+
cmd = "coverage run --source=mosca --branch --omit='*/mosca/tango/moscav1.py' -m pytest tests/mosca"
|
|
183
|
+
default-environment = "testserver"
|
|
184
|
+
|
|
185
|
+
[tool.pixi.tasks.cov_v1]
|
|
186
|
+
cmd = """
|
|
165
187
|
coverage run --data-file='v1cov/.coverage' --include='*/controllers/mosca/*' --branch -m pytest tests/bliss/v1 && \
|
|
166
188
|
cd v1cov && \
|
|
167
189
|
coverage combine && \
|
|
@@ -169,8 +191,47 @@ cov_v1 = """
|
|
|
169
191
|
coverage report && \
|
|
170
192
|
mv htmlcovv1 ..
|
|
171
193
|
"""
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
194
|
+
default-environment = "testbliss"
|
|
195
|
+
|
|
196
|
+
[tool.pixi.tasks.cov_bliss]
|
|
197
|
+
cmd = "coverage run --source=mosca --omit='*/mosca/tango/moscav1.py' --branch -m pytest tests/bliss/ --ignore=tests/bliss/v1"
|
|
198
|
+
default-environment = "testblissmosca"
|
|
199
|
+
|
|
200
|
+
[tool.pixi.tasks.test_server]
|
|
201
|
+
cmd = "pytest tests/mosca --ignore=tests/mosca/rpc"
|
|
202
|
+
default-environment = "testserver"
|
|
203
|
+
|
|
204
|
+
[tool.pixi.tasks.test_rpc]
|
|
205
|
+
cmd = "pytest tests/mosca/rpc"
|
|
206
|
+
default-environment = "testrpc"
|
|
207
|
+
|
|
208
|
+
[tool.pixi.tasks.test_v1]
|
|
209
|
+
cmd = "pytest tests/bliss/v1"
|
|
210
|
+
default-environment = "testbliss"
|
|
211
|
+
|
|
212
|
+
[tool.pixi.tasks.test_bliss]
|
|
213
|
+
cmd = "pytest tests/bliss/"
|
|
214
|
+
default-environment = "testblissmosca"
|
|
215
|
+
|
|
216
|
+
[tool.pixi.tasks.bliss]
|
|
217
|
+
description = "Starts a bliss session: pixi run bliss <SESSION> [BEACON_HOST] [TANGO_HOST]"
|
|
218
|
+
cmd = "{% if beacon_host %}export BEACON_HOST={{ beacon_host }} && {% endif %} {% if tango_host %}export TANGO_HOST={{ tango_host }} && {% endif %}bliss -s {{ session }} --no-tmux"
|
|
219
|
+
args = ["session",
|
|
220
|
+
{ arg = "tango_host", default = "" },
|
|
221
|
+
{ arg = "beacon_host", default = "" },]
|
|
222
|
+
default-environment = "bliss"
|
|
223
|
+
|
|
224
|
+
[tool.pixi.tasks.test_bliss23]
|
|
225
|
+
cmd = "pytest tests/bliss"
|
|
226
|
+
default-environment = "testblissmosca23"
|
|
227
|
+
|
|
228
|
+
[tool.pixi.tasks.blisswriter]
|
|
229
|
+
description = "Run a BlissWriter Tango server: pixi run blisswriter <INSTANCE> [TANGO_HOST]"
|
|
230
|
+
cmd = "{% if tango_host %}export TANGO_HOST={{ tango_host }} && {% endif %}blisswriter tango run {{ instance }}"
|
|
231
|
+
args = ["instance", { arg = "tango_host", default = "" }]
|
|
232
|
+
default-environment = "blisswriter"
|
|
233
|
+
|
|
234
|
+
[tool.pixi.tasks.sync_blissdep]
|
|
235
|
+
description = "Regenerate the blissdep feature from bliss's conda-requirements.txt: pixi run sync_blissdep [BRANCH_OR_PATH]"
|
|
236
|
+
cmd = "python3 scripts/sync_blissdep.py {{ ref }}"
|
|
237
|
+
args = [{ arg = "ref", default = "2.4.x" }]
|
|
@@ -73,7 +73,5 @@ class AcquisitionModes(enum.IntEnum):
|
|
|
73
73
|
|
|
74
74
|
class DiscardMode(enum.IntEnum):
|
|
75
75
|
NONE = 0
|
|
76
|
-
#
|
|
77
|
-
# ODD = enum.auto()
|
|
78
|
-
# EVEN = enum.auto()
|
|
76
|
+
# DiscardMode.ODD/EVEN: not implemented (see git history).
|
|
79
77
|
FIRST = enum.auto()
|
|
@@ -26,22 +26,20 @@ ASC_TIME = "%Y-%m-%d %H:%M:%S"
|
|
|
26
26
|
|
|
27
27
|
|
|
28
28
|
class COLORS(enum.Enum):
|
|
29
|
-
GREY = "\x1b[38;21m"
|
|
30
29
|
BLUE = "\x1b[38;5;39m"
|
|
31
30
|
YELLOW = "\x1b[38;5;226m"
|
|
32
31
|
GREEN = "\x1b[32m"
|
|
33
32
|
RED = "\x1b[38;5;196m"
|
|
34
33
|
BOLD_RED = "\x1b[31;1m"
|
|
35
34
|
RESET = "\x1b[0m"
|
|
36
|
-
NONE = ""
|
|
37
35
|
|
|
38
36
|
|
|
39
37
|
FORMATS = {
|
|
40
|
-
logging.DEBUG: COLORS.BLUE
|
|
41
|
-
logging.INFO: COLORS.GREEN
|
|
42
|
-
logging.WARNING: COLORS.YELLOW
|
|
43
|
-
logging.ERROR: COLORS.RED
|
|
44
|
-
logging.CRITICAL: COLORS.BOLD_RED
|
|
38
|
+
logging.DEBUG: COLORS.BLUE,
|
|
39
|
+
logging.INFO: COLORS.GREEN,
|
|
40
|
+
logging.WARNING: COLORS.YELLOW,
|
|
41
|
+
logging.ERROR: COLORS.RED,
|
|
42
|
+
logging.CRITICAL: COLORS.BOLD_RED
|
|
45
43
|
}
|
|
46
44
|
|
|
47
45
|
|
|
@@ -112,18 +110,6 @@ def mosca_enable_log_file(filename, *args, **kwargs):
|
|
|
112
110
|
MOSCA_LOGGER.addHandler(hdlr)
|
|
113
111
|
|
|
114
112
|
|
|
115
|
-
def get_logger(name):
|
|
116
|
-
"""
|
|
117
|
-
Return the mosca logger with the given name.
|
|
118
|
-
If <logfile> file name is provided then logs will be written to the given file.
|
|
119
|
-
"""
|
|
120
|
-
split_name = name.split(".")
|
|
121
|
-
if split_name[0] != "mosca":
|
|
122
|
-
split_name = ["mosca"] + split_name
|
|
123
|
-
name = ".".join(split_name)
|
|
124
|
-
return logging.getLogger(name)
|
|
125
|
-
|
|
126
|
-
|
|
127
113
|
def mosca_logger_names(rx_pattern=None):
|
|
128
114
|
logger_names = [name for name in logging.root.manager.loggerDict if name.startswith("mosca")]
|
|
129
115
|
if rx_pattern:
|
|
@@ -2,59 +2,26 @@ import logging
|
|
|
2
2
|
logger = logging.getLogger(__name__)
|
|
3
3
|
|
|
4
4
|
import time
|
|
5
|
-
import typing
|
|
6
5
|
import queue
|
|
7
6
|
import threading
|
|
8
7
|
from contextlib import contextmanager
|
|
9
8
|
|
|
10
9
|
|
|
11
|
-
USE_GEVENT = None
|
|
12
|
-
|
|
13
|
-
|
|
14
10
|
def RLock(*args, **kwargs):
|
|
15
|
-
|
|
16
|
-
raise NotImplementedError
|
|
17
|
-
else:
|
|
18
|
-
return threading.RLock(*args, **kwargs)
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
def Lock(*args, **kwargs):
|
|
22
|
-
if USE_GEVENT:
|
|
23
|
-
raise NotImplementedError
|
|
24
|
-
else:
|
|
25
|
-
return threading.Lock(*args, **kwargs)
|
|
11
|
+
return threading.RLock(*args, **kwargs)
|
|
26
12
|
|
|
27
13
|
|
|
28
|
-
def
|
|
29
|
-
|
|
30
|
-
raise NotImplementedError
|
|
31
|
-
else:
|
|
32
|
-
return threading.Event(*args, **kwargs)
|
|
14
|
+
def Lock(*args, **kwargs):
|
|
15
|
+
return threading.Lock(*args, **kwargs)
|
|
33
16
|
|
|
34
17
|
|
|
35
18
|
def Queue(*args, **kwargs):
|
|
36
|
-
|
|
37
|
-
raise NotImplementedError
|
|
38
|
-
else:
|
|
39
|
-
return queue.Queue(*args, **kwargs)
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
def run(target, *args, **kwargs):
|
|
43
|
-
if USE_GEVENT:
|
|
44
|
-
raise NotImplementedError
|
|
45
|
-
else:
|
|
46
|
-
thread = threading.Thread(target=target, args=args, kwargs=kwargs)
|
|
47
|
-
thread.daemon=True
|
|
48
|
-
thread.start()
|
|
49
|
-
return thread
|
|
19
|
+
return queue.Queue(*args, **kwargs)
|
|
50
20
|
|
|
51
21
|
|
|
52
22
|
def sleep(time_s):
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
else:
|
|
56
|
-
return time.sleep(time_s)
|
|
57
|
-
|
|
23
|
+
return time.sleep(time_s)
|
|
24
|
+
|
|
58
25
|
|
|
59
26
|
class Timeout:
|
|
60
27
|
timeout = property(lambda self: self._timeout)
|
|
@@ -82,26 +49,17 @@ def get_lock(lock, timeout=-1):
|
|
|
82
49
|
|
|
83
50
|
class AsyncTask:
|
|
84
51
|
stop_set = property(lambda self: self._stop_event.is_set())
|
|
85
|
-
start_lock = property(lambda self: self._start_lock)
|
|
86
52
|
queue = property(lambda self: self._queue)
|
|
87
53
|
|
|
88
|
-
def __init__(self, *args, run_func=None, prepare_func=None, cleanup_func=None,
|
|
54
|
+
def __init__(self, *args, run_func=None, prepare_func=None, cleanup_func=None, start=True, **kwargs):
|
|
89
55
|
super().__init__()
|
|
90
56
|
|
|
91
57
|
self._thread = None
|
|
92
|
-
self.
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
self._lock = threading.RLock()
|
|
98
|
-
else:
|
|
99
|
-
self._lock = threading.Lock()
|
|
100
|
-
self._start_lock = threading.Lock()
|
|
101
|
-
self._start_event = threading.Event()
|
|
102
|
-
self._stop_event = threading.Event()
|
|
103
|
-
self._queue = queue.Queue()
|
|
104
|
-
self._sleep = time.sleep
|
|
58
|
+
self._start_lock = threading.Lock()
|
|
59
|
+
self._start_event = threading.Event()
|
|
60
|
+
self._stop_event = threading.Event()
|
|
61
|
+
self._queue = queue.Queue()
|
|
62
|
+
self._sleep = time.sleep
|
|
105
63
|
|
|
106
64
|
self._prepare_fn = prepare_func
|
|
107
65
|
self._run_fn = run_func
|
|
@@ -113,10 +71,7 @@ class AsyncTask:
|
|
|
113
71
|
def ready(self):
|
|
114
72
|
if self._thread is None:
|
|
115
73
|
return True
|
|
116
|
-
|
|
117
|
-
raise NotImplementedError
|
|
118
|
-
else:
|
|
119
|
-
return not self._thread.is_alive()
|
|
74
|
+
return not self._thread.is_alive()
|
|
120
75
|
|
|
121
76
|
def put(self, data):
|
|
122
77
|
self._queue.put(data)
|
|
@@ -125,11 +80,8 @@ class AsyncTask:
|
|
|
125
80
|
return self._queue.get(timeout=timeout)
|
|
126
81
|
|
|
127
82
|
def _thread_run(self, *args, **kwargs):
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
else:
|
|
131
|
-
thread = threading.Thread(target=self._run_target, args=args, kwargs=kwargs)
|
|
132
|
-
thread.start()
|
|
83
|
+
thread = threading.Thread(target=self._run_target, args=args, kwargs=kwargs)
|
|
84
|
+
thread.start()
|
|
133
85
|
return thread
|
|
134
86
|
|
|
135
87
|
def __call__(self, *args, **kwargs):
|
|
@@ -182,12 +134,6 @@ class AsyncTask:
|
|
|
182
134
|
def _cleanup(self, *args, **kwargs):
|
|
183
135
|
if self._cleanup_fn:
|
|
184
136
|
self._cleanup_fn(self, *args, **kwargs)
|
|
185
|
-
if self._use_gevent:
|
|
186
|
-
import gevent
|
|
187
|
-
gevent.get_hub().destroy(True)
|
|
188
|
-
|
|
189
|
-
def wait_started(self):
|
|
190
|
-
self._start_event.wait()
|
|
191
137
|
|
|
192
138
|
def sleep(self, time_s):
|
|
193
139
|
self._sleep(time_s)
|
|
@@ -1,11 +1,46 @@
|
|
|
1
|
+
import io
|
|
2
|
+
import os
|
|
1
3
|
import inspect
|
|
2
4
|
from weakref import WeakMethod
|
|
3
5
|
import logging
|
|
4
6
|
logger = logging.getLogger(__name__)
|
|
5
7
|
|
|
8
|
+
from ruamel.yaml import YAML
|
|
9
|
+
from ruamel.yaml.representer import RoundTripRepresenter
|
|
10
|
+
import numpy
|
|
11
|
+
|
|
6
12
|
from .threads import Lock
|
|
7
13
|
|
|
8
14
|
|
|
15
|
+
class _Representer(RoundTripRepresenter):
|
|
16
|
+
""" Represents numpy scalars and arrays as plain python values. """
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
_Representer.add_multi_representer(
|
|
20
|
+
numpy.generic, lambda rep, data: rep.represent_data(data.item()))
|
|
21
|
+
_Representer.add_multi_representer(
|
|
22
|
+
numpy.ndarray, lambda rep, data: rep.represent_data(data.tolist()))
|
|
23
|
+
|
|
24
|
+
|
|
25
|
+
def yaml_str(obj):
|
|
26
|
+
""" Dumps obj to a YAML string. """
|
|
27
|
+
stream = io.StringIO()
|
|
28
|
+
yaml = YAML()
|
|
29
|
+
yaml.Representer = _Representer
|
|
30
|
+
yaml.dump(obj, stream=stream)
|
|
31
|
+
return stream.getvalue()
|
|
32
|
+
|
|
33
|
+
|
|
34
|
+
def list_files(path, ext, strip):
|
|
35
|
+
""" Returns the sorted paths (relative to path, stripped of the leading
|
|
36
|
+
strip characters) of the files ending with ext found under path. """
|
|
37
|
+
return sorted([
|
|
38
|
+
os.path.relpath(os.path.join(dp, f), path).lstrip(strip)
|
|
39
|
+
for dp, dn, fn in os.walk(path)
|
|
40
|
+
for f in fn
|
|
41
|
+
if f.endswith(ext)])
|
|
42
|
+
|
|
43
|
+
|
|
9
44
|
|
|
10
45
|
# TODO: allow multiple callback
|
|
11
46
|
|