pymodaq_plugins_utils 5.0.5__tar.gz → 5.0.7__tar.gz

{pymodaq_plugins_utils-5.0.5 → pymodaq_plugins_utils-5.0.7}/.github/workflows/Test.yml

@@ -6,5 +6,5 @@ jobs:
   call_workflow:
     uses: ./.github/workflows/Testbase.yml
     with:
-      python: '3.11'
-      qt5: 'pyqt5'
+      python: '3.12'
+      qt5: 'pyside6'

{pymodaq_plugins_utils-5.0.5 → pymodaq_plugins_utils-5.0.7}/.github/workflows/Testbase.yml

@@ -18,9 +18,9 @@ jobs:
       QT_DEBUG_PLUGINS: 1
     steps:
       - name: Set up Python ${{ inputs.python }}
-        uses: actions/checkout@v6.0.3
+        uses: actions/checkout@v7.0.1
       - name: Install dependencies
-        uses: actions/setup-python@v6.2.0
+        uses: actions/setup-python@v7.0.0
         with:
           python-version: ${{ inputs.python }}
       - name: Install package
@@ -41,4 +41,4 @@ jobs:
           flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics --exclude=src/pymodaq/resources/QtDesigner_Ressources,docs
       - name: Test with pytest
         run: |
-          pytest -n auto -k "not test_compatibility"
+          pytest -n auto

{pymodaq_plugins_utils-5.0.5 → pymodaq_plugins_utils-5.0.7}/.github/workflows/compatibility.yml

@@ -36,10 +36,10 @@ jobs:
           echo "plugin_name=$(echo '${{ github.repository }}' | cut -d'/' -f2)" >> $GITHUB_ENV
 
       - name: Checkout the repo
-        uses: actions/checkout@v6.0.3
+        uses: actions/checkout@v7.0.1
  
       - name: Set up Python ${{ matrix.python-version }}
-        uses: actions/setup-python@v6.2.0
+        uses: actions/setup-python@v7.0.0
         with:
           python-version: ${{ matrix.python-version }}
           

{pymodaq_plugins_utils-5.0.5 → pymodaq_plugins_utils-5.0.7}/.github/workflows/python-publish.yml

@@ -13,9 +13,9 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v6.0.3
+    - uses: actions/checkout@v7.0.1
     - name: Set up Python
-      uses: actions/setup-python@v6.2.0
+      uses: actions/setup-python@v7.0.0
       with:
         python-version: '3.13'
     - name: Install dependencies

{pymodaq_plugins_utils-5.0.5 → pymodaq_plugins_utils-5.0.7}/.github/workflows/updater.yml

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

{pymodaq_plugins_utils-5.0.5 → pymodaq_plugins_utils-5.0.7}/PKG-INFO

@@ -1,11 +1,11 @@
-Metadata-Version: 2.4
+Metadata-Version: 2.5
 Name: pymodaq_plugins_utils
-Version: 5.0.5
+Version: 5.0.7
 Summary: Set of utility methods and classes to interact with instruments
 Project-URL: Homepage, https://pymodaq.cnrs.fr
 Project-URL: Documentation , https://pymodaq.cnrs.fr
 Project-URL: Repository , https://github.com/PyMoDAQ/pymodaq_plugins_utils
-Author-email: Weber Sebastien <sebastien.weber@cemes.fr>
+Author-email: Weber Sebastien <sebastien.weber@cemes.fr>, Schouder Constant <constant.schouder@universite-paris-saclay.fr>
 Maintainer-email: Weber Sebastien <sebastien.weber@cemes.fr>
 License: The MIT License (MIT)
         
@@ -44,6 +44,9 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Software Development :: User Interfaces
 Requires-Python: >=3.8
 Requires-Dist: pymodaq>=5.0.0
+Provides-Extra: camera
+Requires-Dist: opencv-python; extra == 'camera'
+Requires-Dist: pylablib; extra == 'camera'
 Provides-Extra: serial
 Requires-Dist: pyserial; extra == 'serial'
 Requires-Dist: pyvisa; extra == 'serial'
@@ -75,7 +78,7 @@ Authors
 =======
 
 * Sebastien J. Weber (sebastien.weber@cemes.fr)
-* Other author (myotheremail@xxx.org)
+* Constant Schouder (constant.schouder@universite-paris-saclay.fr)
 
 .. if needed use this field
 

{pymodaq_plugins_utils-5.0.5 → pymodaq_plugins_utils-5.0.7}/README.rst

@@ -24,7 +24,7 @@ Authors
 =======
 
 * Sebastien J. Weber (sebastien.weber@cemes.fr)
-* Other author (myotheremail@xxx.org)
+* Constant Schouder (constant.schouder@universite-paris-saclay.fr)
 
 .. if needed use this field
 

{pymodaq_plugins_utils-5.0.5 → pymodaq_plugins_utils-5.0.7}/pyproject.toml

@@ -14,6 +14,11 @@ serial = [
     "pyserial",
 ]
 
+camera = [
+    "pylablib",
+    "opencv-python",
+]
+
 [project]
 name = "pymodaq_plugins_utils"
 description = 'Set of utility methods and classes to interact with instruments'
@@ -24,7 +29,7 @@ dependencies = [
 
 authors = [
     {name = "Weber Sebastien", email = "sebastien.weber@cemes.fr"},
-    #todo: list here all authors of your plugin
+    {name = "Schouder Constant", email = "constant.schouder@universite-paris-saclay.fr"},
 ]
 maintainers = [
     {name = "Weber Sebastien", email = "sebastien.weber@cemes.fr"},

{pymodaq_plugins_utils-5.0.5 → pymodaq_plugins_utils-5.0.7}/src/pymodaq_plugins_utils/hardware/camera_base_pylablib.py

@@ -86,6 +86,11 @@ class CameraCallback(QtCore.QObject):
                     while ind_frames < mode.nframes:
                         self.controller.wait_for_frame(since='now')
                         new_frames, rng = self.controller.read_multiple_images(missing_frame='skip', return_rng=True)
+
+                        # in case hardware has a random buffer size (ex: Andor CCD cameras)
+                        if new_frames.shape[0] != mode.nframes:
+                            new_frames = np.expand_dims(new_frames[-mode.nframes:], axis=0)
+
                         if ind_average == 0 and ind_frames == 0:
                             shape = list(new_frames.shape[1:])
                             shape = [mode.n_average, mode.nframes] + shape
@@ -300,7 +305,7 @@ class CameraBasePyLabLib(DAQ_Viewer_base):
         self.settings.child('buffer', 'mode').setReadonly(True)
 
 
-        self.callback_thread = QtCore.QThread()  # creation of a Qt5 thread
+        self.callback_thread = QtCore.QThread(self)  # creation of a Qt5 thread
         callback.moveToThread(self.callback_thread)  # callback object will live within this thread
 
         callback.data_sig.connect(

pymodaq_plugins_utils-5.0.7/tests/import_report_pymodaq_plugins_utils_None.txt

@@ -0,0 +1 @@
+"from pymodaq_plugins_template.utils import Config" in C:\Users\weber\Labo\ProgrammesPython\PyMoDAQ_Git\pymodaq_plugins_folder\pymodaq_plugins_utils\src\pymodaq_plugins_utils\extensions\custom_extension_template.py (12)

{pymodaq_plugins_utils-5.0.5 → pymodaq_plugins_utils-5.0.7}/tests/test_plugin_package_structure.py

@@ -60,14 +60,6 @@ def test_imports():
     mod = importlib.import_module(pkg_name)
     assert hasattr(mod, 'config')
     assert hasattr(mod, '__version__')
-    move_mod = importlib.import_module(f'{pkg_name}', 'daq_move_plugins')
-    importlib.import_module(f'{pkg_name}', 'daq_viewer_plugins')
-    importlib.import_module(f'{pkg_name}', 'extensions')
-    importlib.import_module(f'{pkg_name}', 'models')
-    importlib.import_module(f'{pkg_name}.daq_viewer_plugins', 'plugins_0D')
-    importlib.import_module(f'{pkg_name}.daq_viewer_plugins', 'plugins_1D')
-    importlib.import_module(f'{pkg_name}.daq_viewer_plugins', 'plugins_2D')
-    importlib.import_module(f'{pkg_name}.daq_viewer_plugins', 'plugins_ND')
 
 
 def test_move_inst_plugins_name():
@@ -117,18 +109,3 @@ def test_viewer_has_mandatory_methods(dim):
         for meth in MANDATORY_VIEWER_METHODS:
             assert hasattr(klass, meth)
 
-def test_compatibility(capsys):
-    capsys.disabled()
-    try:
-        from pymodaq_plugin_manager.compatibility_checker import PyMoDAQPlugin
-    except (ModuleNotFoundError, ImportError) as e:
-        pytest.fail(f"Please update pymodaq_plugin_manager to a newer version: {e}")
-
-    plugin = PyMoDAQPlugin(get_package_name(), None)
-    success = plugin.all_imports_valid()
-    msg = '\n'.join(plugin.failed_imports + [''])
-
-    if not success:
-        plugin.save_import_report(".")
-
-    assert success, msg