pymodaq 5.0.17__tar.gz → 5.1.0__tar.gz

{pymodaq-5.0.17 → pymodaq-5.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pymodaq
-Version: 5.0.17
+Version: 5.1.0
 Summary: Modular Data Acquisition with Python
 Project-URL: Homepage, http://pymodaq.cnrs.fr
 Project-URL: Source, https://github.com/PyMoDAQ/PyMoDAQ
@@ -43,18 +43,19 @@ Classifier: Topic :: Scientific/Engineering :: Visualization
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Software Development :: User Interfaces
 Requires-Python: >=3.8
-Requires-Dist: bayesian-optimization<2.0.0
+Requires-Dist: adaptive
+Requires-Dist: bayesian-optimization>=2.0
 Requires-Dist: easydict
 Requires-Dist: multipledispatch
 Requires-Dist: numpy<2.0.0
 Requires-Dist: packaging
 Requires-Dist: pint
-Requires-Dist: pyleco<=0.4.2,>0.3; python_version >= '3.8'
-Requires-Dist: pymodaq-data>=5.0.18
-Requires-Dist: pymodaq-gui<5.0.23,>=5.0.17
+Requires-Dist: pyleco>0.3; python_version >= '3.8'
+Requires-Dist: pymodaq-data>=5.0.21
+Requires-Dist: pymodaq-gui>=5.0.26
 Requires-Dist: pymodaq-plugin-manager>=0.0.17
 Requires-Dist: pymodaq-plugins-mock>=5.0.5
-Requires-Dist: pymodaq-utils<1.0.0,>=0.0.14
+Requires-Dist: pymodaq-utils>=1.0.10
 Requires-Dist: pyqtgraph>=0.12
 Requires-Dist: python-dateutil
 Requires-Dist: qtconsole

{pymodaq-5.0.17 → pymodaq-5.1.0}/pyproject.toml

@@ -31,9 +31,9 @@ classifiers = [
     "Topic :: Software Development :: User Interfaces",
 ]
 dependencies = [
-    "pymodaq_utils>=0.0.14, <1.0.0",
-    "pymodaq_gui>=5.0.17, <5.0.23",
-    "pymodaq_data>=5.0.18",
+    "pymodaq_utils>=1.0.10",
+    "pymodaq_gui>=5.0.26",
+    "pymodaq_data>=5.0.21",
     "easydict",
     "multipledispatch",
     "numpy < 2.0.0",
@@ -49,14 +49,15 @@ dependencies = [
     "simple_pid",
     "toml",
     "qtconsole",
-    "pyleco>0.3, <=0.4.2; python_version>=\"3.8\"",
-    "bayesian-optimization<2.0.0",
+    "pyleco>0.3; python_version>=\"3.8\"",
+    "bayesian-optimization>=2.0",
+    "adaptive",
 ]
 
 
 [project.optional-dependencies]
 dev = [
-    "hatch", 
+    "hatch",
     "flake8",
     "h5py",
     "pytest",
@@ -78,8 +79,7 @@ daq_move = "pymodaq.control_modules.daq_move:main"
 daq_scan = "pymodaq.extensions.daq_scan:main"
 daq_viewer = "pymodaq.control_modules.daq_viewer:main"
 dashboard = "pymodaq.dashboard:main"
-h5browser = "pymodaq.extensions.h5browser:main"
-parameter_example = "pymodaq.examples.parameter_ex:main"
+
 
 [project.urls]
 Homepage = "http://pymodaq.cnrs.fr"
@@ -100,3 +100,6 @@ omit = [
     "*/examples/*",
     "*/resources/*"
 ]
+
+[tool.ruff]
+line-length = 120

{pymodaq-5.0.17 → pymodaq-5.1.0}/src/pymodaq/__init__.py

@@ -27,19 +27,23 @@ try:
 
         from pymodaq_utils.config import Config
         from pymodaq.utils.scanner.utils import register_scanners
+        from pymodaq.control_modules.ui_utils import register_uis
         from pymodaq_data.plotting.plotter.plotter import register_plotter, PlotterFactory
 
         # issue on windows when using .NET code within multithreads, this below allows it but requires
         # the pywin32 (pythoncom) package
-        if importlib.util.find_spec('clr') is not None:
-            try:
-                import pythoncom
-                pythoncom.CoInitialize()
-            except ModuleNotFoundError as e:
-                infos = "You have installed plugins requiring the pywin32 package to work correctly," \
-                        " please type in *pip install pywin32* and restart PyMoDAQ"
-                print(infos)
-                logger.warning(infos)
+        try:
+            if importlib.util.find_spec('clr') is not None:
+                try:
+                    import pythoncom
+                    pythoncom.CoInitialize()
+                except ModuleNotFoundError as e:
+                    infos = "You have installed plugins requiring the pywin32 package to work correctly," \
+                            " please type in *pip install pywin32* and restart PyMoDAQ"
+                    print(infos)
+                    logger.warning(infos)
+        except ValueError:
+            pass
 
         config = Config()  # to ckeck for config file existence, otherwise create one
         copy_preset()
@@ -59,6 +63,11 @@ try:
                     " You should update it."
             print(infos)
             logger.warning(infos)
+        logger.info('*************************************************************************')
+        logger.info(f"Registering UIs...")
+        register_uis(parent_module_name='pymodaq.control_modules.daq_move_ui')
+        logger.info(f"Done")
+        logger.info('************************')
 
         logger.info('*************************************************************************')
         logger.info(f"Getting the list of instrument plugins...")
@@ -74,9 +83,12 @@ try:
         logger.info(f"Done")
         logger.info('************************')
 
-    except Exception:
-        print("Couldn't create the local folder to store logs , presets...")
 
+    except Exception as e:
+        try:
+            logger.exception(str(e))
+        except Exception as e:
+            print(str(e))
 
 
 except Exception as e:

pymodaq-5.1.0/src/pymodaq/control_modules/__init__.py

@@ -0,0 +1 @@
+from . import ui_utils  # to avoid circular import