pymodaq_data 5.1.2__tar.gz → 5.1.3__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.
Files changed (28) hide show
  1. {pymodaq_data-5.1.2 → pymodaq_data-5.1.3}/PKG-INFO +9 -15
  2. {pymodaq_data-5.1.2 → pymodaq_data-5.1.3}/README.rst +8 -8
  3. {pymodaq_data-5.1.2 → pymodaq_data-5.1.3}/pyproject.toml +3 -7
  4. {pymodaq_data-5.1.2 → pymodaq_data-5.1.3}/src/pymodaq_data/h5modules/data_saving.py +4 -2
  5. {pymodaq_data-5.1.2 → pymodaq_data-5.1.3}/.gitignore +0 -0
  6. {pymodaq_data-5.1.2 → pymodaq_data-5.1.3}/LICENSE +0 -0
  7. {pymodaq_data-5.1.2 → pymodaq_data-5.1.3}/src/pymodaq_data/__init__.py +0 -0
  8. {pymodaq_data-5.1.2 → pymodaq_data-5.1.3}/src/pymodaq_data/data.py +0 -0
  9. {pymodaq_data-5.1.2 → pymodaq_data-5.1.3}/src/pymodaq_data/h5modules/__init__.py +0 -0
  10. {pymodaq_data-5.1.2 → pymodaq_data-5.1.3}/src/pymodaq_data/h5modules/backends.py +0 -0
  11. {pymodaq_data-5.1.2 → pymodaq_data-5.1.3}/src/pymodaq_data/h5modules/browsing.py +0 -0
  12. {pymodaq_data-5.1.2 → pymodaq_data-5.1.3}/src/pymodaq_data/h5modules/exporter.py +0 -0
  13. {pymodaq_data-5.1.2 → pymodaq_data-5.1.3}/src/pymodaq_data/h5modules/exporters/__init__.py +0 -0
  14. {pymodaq_data-5.1.2 → pymodaq_data-5.1.3}/src/pymodaq_data/h5modules/exporters/base.py +0 -0
  15. {pymodaq_data-5.1.2 → pymodaq_data-5.1.3}/src/pymodaq_data/h5modules/exporters/flimj.py +0 -0
  16. {pymodaq_data-5.1.2 → pymodaq_data-5.1.3}/src/pymodaq_data/h5modules/exporters/hyperspy.py +0 -0
  17. {pymodaq_data-5.1.2 → pymodaq_data-5.1.3}/src/pymodaq_data/h5modules/saving.py +0 -0
  18. {pymodaq_data-5.1.2 → pymodaq_data-5.1.3}/src/pymodaq_data/h5modules/utils.py +0 -0
  19. {pymodaq_data-5.1.2 → pymodaq_data-5.1.3}/src/pymodaq_data/icon.ico +0 -0
  20. {pymodaq_data-5.1.2 → pymodaq_data-5.1.3}/src/pymodaq_data/numpy_func.py +0 -0
  21. {pymodaq_data-5.1.2 → pymodaq_data-5.1.3}/src/pymodaq_data/plotting/__init__.py +0 -0
  22. {pymodaq_data-5.1.2 → pymodaq_data-5.1.3}/src/pymodaq_data/plotting/plotter/plotter.py +0 -0
  23. {pymodaq_data-5.1.2 → pymodaq_data-5.1.3}/src/pymodaq_data/plotting/plotter/plotters/__init__.py +0 -0
  24. {pymodaq_data-5.1.2 → pymodaq_data-5.1.3}/src/pymodaq_data/plotting/plotter/plotters/matplotlib_plotters.py +0 -0
  25. {pymodaq_data-5.1.2 → pymodaq_data-5.1.3}/src/pymodaq_data/post_treatment/__init__.py +0 -0
  26. {pymodaq_data-5.1.2 → pymodaq_data-5.1.3}/src/pymodaq_data/post_treatment/process_to_scalar.py +0 -0
  27. {pymodaq_data-5.1.2 → pymodaq_data-5.1.3}/src/pymodaq_data/slicing.py +0 -0
  28. {pymodaq_data-5.1.2 → pymodaq_data-5.1.3}/src/pymodaq_data/splash.png +0 -0
@@ -1,6 +1,6 @@
1
1
  Metadata-Version: 2.4
2
2
  Name: pymodaq_data
3
- Version: 5.1.2
3
+ Version: 5.1.3
4
4
  Summary: Modular Data Acquisition with Python
5
5
  Project-URL: Homepage, http://pymodaq.cnrs.fr
6
6
  Project-URL: Source, https://github.com/PyMoDAQ/PyMoDAQ
@@ -43,16 +43,10 @@ Classifier: Topic :: Scientific/Engineering :: Visualization
43
43
  Classifier: Topic :: Software Development :: Libraries :: Python Modules
44
44
  Classifier: Topic :: Software Development :: User Interfaces
45
45
  Requires-Python: >=3.8
46
- Requires-Dist: multipledispatch
47
- Requires-Dist: numpy<2.0.0
48
- Requires-Dist: packaging
49
- Requires-Dist: pint
50
46
  Requires-Dist: pymodaq-utils>=0.0.8
51
- Requires-Dist: python-dateutil
52
47
  Requires-Dist: scipy
53
48
  Requires-Dist: tables<3.9; python_version < '3.10'
54
49
  Requires-Dist: tables>=3.10; python_version >= '3.10'
55
- Requires-Dist: toml
56
50
  Provides-Extra: dev
57
51
  Requires-Dist: flake8; extra == 'dev'
58
52
  Requires-Dist: h5py; extra == 'dev'
@@ -97,28 +91,28 @@ PyMoDAQ Data
97
91
 
98
92
 
99
93
 
100
- .. |39-linux| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_data/dev/tests_Linux_3.9.svg
94
+ .. |39-linux| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_data/5.1.x/tests_Linux_3.9.svg
101
95
  :target: https://github.com/PyMoDAQ/pymodaq_data/actions/workflows/tests-data.yml
102
96
 
103
- .. |310-linux| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_data/dev/tests_Linux_3.10.svg
97
+ .. |310-linux| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_data/5.1.x/tests_Linux_3.10.svg
104
98
  :target: https://github.com/PyMoDAQ/pymodaq_data/actions/workflows/tests-data.yml
105
99
 
106
- .. |311-linux| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_data/dev/tests_Linux_3.11.svg
100
+ .. |311-linux| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_data/5.1.x/tests_Linux_3.11.svg
107
101
  :target: https://github.com/PyMoDAQ/pymodaq_data/actions/workflows/tests-data.yml
108
102
 
109
- .. |312-linux| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_data/dev/tests_Linux_3.12.svg
103
+ .. |312-linux| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_data/5.1.x/tests_Linux_3.12.svg
110
104
  :target: https://github.com/PyMoDAQ/pymodaq_data/actions/workflows/tests-data.yml
111
105
 
112
- .. |39-windows| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_data/dev/tests_Windows_3.9.svg
106
+ .. |39-windows| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_data/5.1.x/tests_Windows_3.9.svg
113
107
  :target: https://github.com/PyMoDAQ/pymodaq_data/actions/workflows/tests-data.yml
114
108
 
115
- .. |310-windows| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_data/dev/tests_Windows_3.10.svg
109
+ .. |310-windows| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_data/5.1.x/tests_Windows_3.10.svg
116
110
  :target: https://github.com/PyMoDAQ/pymodaq_data/actions/workflows/tests-data.yml
117
111
 
118
- .. |311-windows| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_data/dev/tests_Windows_3.11.svg
112
+ .. |311-windows| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_data/5.1.x/tests_Windows_3.11.svg
119
113
  :target: https://github.com/PyMoDAQ/pymodaq_data/actions/workflows/tests-data.yml
120
114
 
121
- .. |312-windows| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_data/dev/tests_Windows_3.12.svg
115
+ .. |312-windows| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_data/5.1.x/tests_Windows_3.12.svg
122
116
  :target: https://github.com/PyMoDAQ/pymodaq_data/actions/workflows/tests-data.yml
123
117
 
124
118
 
@@ -33,28 +33,28 @@ PyMoDAQ Data
33
33
 
34
34
 
35
35
 
36
- .. |39-linux| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_data/dev/tests_Linux_3.9.svg
36
+ .. |39-linux| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_data/5.1.x/tests_Linux_3.9.svg
37
37
  :target: https://github.com/PyMoDAQ/pymodaq_data/actions/workflows/tests-data.yml
38
38
 
39
- .. |310-linux| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_data/dev/tests_Linux_3.10.svg
39
+ .. |310-linux| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_data/5.1.x/tests_Linux_3.10.svg
40
40
  :target: https://github.com/PyMoDAQ/pymodaq_data/actions/workflows/tests-data.yml
41
41
 
42
- .. |311-linux| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_data/dev/tests_Linux_3.11.svg
42
+ .. |311-linux| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_data/5.1.x/tests_Linux_3.11.svg
43
43
  :target: https://github.com/PyMoDAQ/pymodaq_data/actions/workflows/tests-data.yml
44
44
 
45
- .. |312-linux| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_data/dev/tests_Linux_3.12.svg
45
+ .. |312-linux| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_data/5.1.x/tests_Linux_3.12.svg
46
46
  :target: https://github.com/PyMoDAQ/pymodaq_data/actions/workflows/tests-data.yml
47
47
 
48
- .. |39-windows| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_data/dev/tests_Windows_3.9.svg
48
+ .. |39-windows| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_data/5.1.x/tests_Windows_3.9.svg
49
49
  :target: https://github.com/PyMoDAQ/pymodaq_data/actions/workflows/tests-data.yml
50
50
 
51
- .. |310-windows| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_data/dev/tests_Windows_3.10.svg
51
+ .. |310-windows| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_data/5.1.x/tests_Windows_3.10.svg
52
52
  :target: https://github.com/PyMoDAQ/pymodaq_data/actions/workflows/tests-data.yml
53
53
 
54
- .. |311-windows| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_data/dev/tests_Windows_3.11.svg
54
+ .. |311-windows| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_data/5.1.x/tests_Windows_3.11.svg
55
55
  :target: https://github.com/PyMoDAQ/pymodaq_data/actions/workflows/tests-data.yml
56
56
 
57
- .. |312-windows| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_data/dev/tests_Windows_3.12.svg
57
+ .. |312-windows| image:: https://raw.githubusercontent.com/PyMoDAQ/PyMoDAQ/badges/pymodaq_data/5.1.x/tests_Windows_3.12.svg
58
58
  :target: https://github.com/PyMoDAQ/pymodaq_data/actions/workflows/tests-data.yml
59
59
 
60
60
 
@@ -32,13 +32,7 @@ classifiers = [
32
32
  ]
33
33
  dependencies = [
34
34
  "pymodaq_utils>=0.0.8",
35
- "multipledispatch",
36
- "numpy < 2.0.0",
37
- "packaging",
38
- "pint",
39
- "python-dateutil",
40
35
  "scipy",
41
- "toml",
42
36
  "tables>=3.10; python_version>=\"3.10\"", # issue with some version of required package blosc2>=2.2.8
43
37
  "tables<3.9; python_version<\"3.10\"", # issue with some version of required package blosc2>=2.2.8
44
38
  ]
@@ -61,11 +55,13 @@ Tracker = "https://github.com/PyMoDAQ/PyMoDAQ/issues"
61
55
  [tool.hatch.version.raw-options]
62
56
  search_parent_directories = true
63
57
  fallback_version = "5.1.0"
64
- git_describe_command = '''sh -c '(git describe --contains --tags $(git rev-list -1 HEAD -- packages/pymodaq_data) || git describe --tags $(git rev-list -1 HEAD -- packages/pymodaq_data)) | cut -d"~" -f1 ' '''
58
+ git_describe_command = "python git_describe.py packages/pymodaq_data"
65
59
 
66
60
  [tool.hatch.version]
67
61
  source = "vcs"
68
62
 
63
+
64
+
69
65
  [tool.hatch.build.targets.sdist]
70
66
  include = [
71
67
  "/src",
@@ -1106,8 +1106,9 @@ class DataLoader:
1106
1106
  data.create_missing_axes()
1107
1107
  return data
1108
1108
 
1109
- def load_all(self, where: GROUP, data: DataToExport, with_bkg=False) -> DataToExport:
1110
-
1109
+ def load_all(self, where: GROUP, data: DataToExport = None, with_bkg=False) -> DataToExport:
1110
+ if data is None:
1111
+ data = DataToExport('Loaded data')
1111
1112
  where = self._h5saver.get_node(where)
1112
1113
  children_dict = where.children()
1113
1114
  data_list = []
@@ -1122,3 +1123,4 @@ class DataLoader:
1122
1123
  break
1123
1124
  data_tmp = DataToExport(name=where.name, data=data_list)
1124
1125
  data.append(data_tmp)
1126
+ return data
File without changes
File without changes