Merge branch 'main' into feature/model_base

Author: seb5g

.github/workflows/Testbase.yml

@@ -18,9 +18,9 @@ jobs:
       QT_DEBUG_PLUGINS: 1
     steps:
       - name: Set up Python ${{ inputs.python }}
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4.2.2
       - name: Install dependencies
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5.5.0
         with:
           python-version: ${{ inputs.python }}
       - name: Install package

.github/workflows/python-publish.yml

@@ -13,9 +13,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v4.2.2
     - name: Set up Python
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v5.5.0
       with:
         python-version: '3.11'
     - name: Install dependencies

.github/workflows/updater.yml

@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v4.2.2
         with:
           # [Required] Access token with `workflow` scope.
           token: ${{ secrets.WORKFLOW_SECRET }}

pyproject.toml

@@ -1,15 +1,30 @@
+[features]  # defines the plugin features contained into this plugin
+instruments = true  # true if plugin contains instrument classes (else false, notice the lowercase for toml files)
+extensions = true  # true if plugins contains dashboard extensions
+models = false  # true if plugins contains pid models
+h5exporters = false  # true if plugin contains custom h5 file exporters
+scanners = false  # true if plugin contains custom scan layout (daq_scan extensions)
+
 [build-system]
 requires = ["hatchling>=1.9.0", "hatch-vcs", "toml", "pymodaq_utils"]
 build-backend = "hatchling.build"
 
+[urls]
+package-url = 'https://github.com/PyMoDAQ/pymodaq_plugins_datamixer'
+
 [project]
-dynamic = ["version", "authors", "dependencies", "description", "urls", "entry-points"]
+dynamic = ["version", "urls", "entry-points"]
 readme = "README.rst"
 license = { file="LICENSE" }
 requires-python = ">=3.8"
-
+description = 'Implements an extension to manipulate data from several DAQ_Viewers'
 name = "pymodaq_plugins_datamixer"
-
+authors = [
+    {name='Sebastien J. Weber', email='sebastien.weber@cnrs.fr'}
+]
+dependencies = [
+    "pymodaq>5.0"
+]
 classifiers = [
     "Development Status :: 5 - Production/Stable",
     "Environment :: Other Environment",

src/pymodaq_plugins_datamixer/extensions/data_mixer.py

@@ -66,9 +66,6 @@ def get_set_model_params(self, model_name):
     def setup_docks(self):
         """Mandatory method to be subclassed to setup the docks layout
 
-        See Also
-        --------
-        pyqtgraph.dockarea.Dock
         """
         self.docks['settings'] = gutils.Dock('Settings')
         self.dockarea.addDock(self.docks['settings'])
@@ -91,6 +88,7 @@ def setup_docks(self):
 
         self.area_computed = gutils.DockArea()
         self.docks['computed'].addWidget(self.area_computed)
+
         self.dte_computed_viewer = ViewerDispatcher(self.area_computed)
 
         if len(self.models) != 0:
@@ -99,9 +97,6 @@ def setup_docks(self):
     def setup_actions(self):
         """Method where to create actions to be subclassed. Mandatory
 
-        See Also
-        --------
-        ActionManager.add_action
         """
         self.add_action('quit', 'Quit', 'close2', "Quit program")
         self.add_action('ini_model', 'Init Model', 'ini')