From 59bba7c72041c7e213cc9cfeb709f50a36b3995e Mon Sep 17 00:00:00 2001 From: Malik Irain Date: Fri, 6 Mar 2026 10:15:51 +0100 Subject: [PATCH 1/4] remove TCP server mock plugins --- .../daq_move_plugins/daq_move_TCPServer.py | 10 ----- .../plugins_0D/daq_0Dviewer_TCPServer.py | 32 ---------------- .../plugins_1D/daq_1Dviewer_TCPServer.py | 38 ------------------- .../plugins_2D/daq_2Dviewer_TCPServer.py | 34 ----------------- 4 files changed, 114 deletions(-) delete mode 100644 src/pymodaq_plugins_mock/daq_move_plugins/daq_move_TCPServer.py delete mode 100644 src/pymodaq_plugins_mock/daq_viewer_plugins/plugins_0D/daq_0Dviewer_TCPServer.py delete mode 100644 src/pymodaq_plugins_mock/daq_viewer_plugins/plugins_1D/daq_1Dviewer_TCPServer.py delete mode 100644 src/pymodaq_plugins_mock/daq_viewer_plugins/plugins_2D/daq_2Dviewer_TCPServer.py diff --git a/src/pymodaq_plugins_mock/daq_move_plugins/daq_move_TCPServer.py b/src/pymodaq_plugins_mock/daq_move_plugins/daq_move_TCPServer.py deleted file mode 100644 index a343542..0000000 --- a/src/pymodaq_plugins_mock/daq_move_plugins/daq_move_TCPServer.py +++ /dev/null @@ -1,10 +0,0 @@ -from pymodaq.control_modules.move_utility_classes import DAQ_Move_TCP_server as MoveTCPServer - - -class DAQ_Move_TCPServer(MoveTCPServer): - """ - - """ - - def __init__(self, parent=None, params_state=None): - super().__init__(parent, params_state) diff --git a/src/pymodaq_plugins_mock/daq_viewer_plugins/plugins_0D/daq_0Dviewer_TCPServer.py b/src/pymodaq_plugins_mock/daq_viewer_plugins/plugins_0D/daq_0Dviewer_TCPServer.py deleted file mode 100644 index 12bf1ba..0000000 --- a/src/pymodaq_plugins_mock/daq_viewer_plugins/plugins_0D/daq_0Dviewer_TCPServer.py +++ /dev/null @@ -1,32 +0,0 @@ -from qtpy.QtCore import Signal -from easydict import EasyDict as edict -from collections import OrderedDict -from pymodaq.control_modules.viewer_utility_classes import DAQ_Viewer_TCP_server -from pymodaq_utils.utils import ThreadCommand, getLineInfo -from pymodaq.utils.data import DataFromPlugins, DataToExport - - -class DAQ_0DViewer_TCPServer(DAQ_Viewer_TCP_server): - """ - ================= ============================== - **Attributes** **Type** - *command_server* instance of Signal - *x_axis* 1D numpy array - *y_axis* 1D numpy array - *data* double precision float array - ================= ============================== - - See Also - -------- - utility_classes.DAQ_TCP_server - """ - params_GRABBER = [] - command_server = Signal(list) - - def __init__(self, parent=None, params_state=None): - super().__init__(parent, params_state, - grabber_type='0D') # initialize base class with commom attributes and methods - - self.x_axis = None - self.y_axis = None - self.data = None diff --git a/src/pymodaq_plugins_mock/daq_viewer_plugins/plugins_1D/daq_1Dviewer_TCPServer.py b/src/pymodaq_plugins_mock/daq_viewer_plugins/plugins_1D/daq_1Dviewer_TCPServer.py deleted file mode 100644 index 8ef3ca8..0000000 --- a/src/pymodaq_plugins_mock/daq_viewer_plugins/plugins_1D/daq_1Dviewer_TCPServer.py +++ /dev/null @@ -1,38 +0,0 @@ -from qtpy.QtCore import Signal -from easydict import EasyDict as edict -from collections import OrderedDict -from pymodaq.control_modules.viewer_utility_classes import DAQ_Viewer_TCP_server -from pymodaq_utils.utils import ThreadCommand, getLineInfo -from pymodaq.utils.data import DataFromPlugins, Axis, DataToExport - - -class DAQ_1DViewer_TCPServer(DAQ_Viewer_TCP_server): - """ - ================= ============================== - **Attributes** **Type** - *command_server* instance of Signal - *x_axis* 1D numpy array - *y_axis* 1D numpy array - *data* double precision float array - ================= ============================== - - See Also - -------- - utility_classes.DAQ_TCP_server - """ - params_GRABBER = [] - - # params = DAQ_TCP_server.params - - command_server = Signal(list) - - # params=DAQ_TCP_server.params - def __init__(self, parent=None, params_state=None): - super().__init__(parent, params_state, - grabber_type='1D') # initialize base class with commom attributes and methods - - self.x_axis = None - self.y_axis = None - self.data = None - - diff --git a/src/pymodaq_plugins_mock/daq_viewer_plugins/plugins_2D/daq_2Dviewer_TCPServer.py b/src/pymodaq_plugins_mock/daq_viewer_plugins/plugins_2D/daq_2Dviewer_TCPServer.py deleted file mode 100644 index 85076e9..0000000 --- a/src/pymodaq_plugins_mock/daq_viewer_plugins/plugins_2D/daq_2Dviewer_TCPServer.py +++ /dev/null @@ -1,34 +0,0 @@ -from qtpy.QtCore import Signal, Slot -from pymodaq.control_modules.viewer_utility_classes import DAQ_Viewer_TCP_server -from pymodaq.utils.data import DataFromPlugins, Axis, DataToExport - - -class DAQ_2DViewer_TCPServer(DAQ_Viewer_TCP_server): - """ - ================= ============================== - **Attributes** **Type** - *command_server* instance of Signal - *x_axis* 1D numpy array - *y_axis* 1D numpy array - *data* double precision float array - ================= ============================== - - See Also - -------- - utility_classes.DAQ_TCP_server - """ - params_GRABBER = [] - - # params = DAQ_TCP_server.params - - command_server = Signal(list) - - # params=DAQ_TCP_server.params - def __init__(self, parent=None, params_state=None): - super().__init__(parent, params_state, - grabber_type='2D') # initialize base class with commom attributes and methods - - self.x_axis = None - self.y_axis = None - self.data = None - From 90061053a555685b3c2c87dcfe5b7cfeaccecbaf Mon Sep 17 00:00:00 2001 From: Malik Irain Date: Fri, 6 Mar 2026 14:33:40 +0100 Subject: [PATCH 2/4] Add hatch to tests workflow to avoid version issues --- .github/workflows/Testbase.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Testbase.yml b/.github/workflows/Testbase.yml index 12c0f17..0722ca0 100644 --- a/.github/workflows/Testbase.yml +++ b/.github/workflows/Testbase.yml @@ -28,7 +28,7 @@ jobs: sudo apt install libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xfixes0 x11-utils python -m pip install --upgrade pip export QT_DEBUG_PLUGINS=1 - pip install flake8 pytest pytest-cov pytest-qt pytest-xdist pytest-xvfb setuptools wheel numpy h5py ${{ inputs.qt5 }} toml + pip install flake8 pytest pytest-cov pytest-qt pytest-xdist pytest-xvfb setuptools wheel numpy h5py ${{ inputs.qt5 }} toml hatch pip install -e . pip install pymodaq - name: create local pymodaq folder and setting permissions From eee57351b1c40de13bebdfcaf28908af6c7a026e Mon Sep 17 00:00:00 2001 From: Malik Irain Date: Fri, 6 Mar 2026 14:36:39 +0100 Subject: [PATCH 3/4] Updated workflow --- .github/workflows/Test.yml | 4 ++-- .github/workflows/Testbase.yml | 11 +++++++---- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/.github/workflows/Test.yml b/.github/workflows/Test.yml index 720d4db..0d71154 100644 --- a/.github/workflows/Test.yml +++ b/.github/workflows/Test.yml @@ -6,5 +6,5 @@ jobs: call_workflow: uses: ./.github/workflows/Testbase.yml with: - python: '3.10' - qt5: 'pyqt5' \ No newline at end of file + python: '3.12' + qt5: 'pyqt6' \ No newline at end of file diff --git a/.github/workflows/Testbase.yml b/.github/workflows/Testbase.yml index 0722ca0..a230950 100644 --- a/.github/workflows/Testbase.yml +++ b/.github/workflows/Testbase.yml @@ -17,10 +17,13 @@ jobs: DISPLAY: ':99.0' QT_DEBUG_PLUGINS: 1 steps: - - name: Set up Python ${{ inputs.python }} - uses: actions/checkout@v3 - - name: Install dependencies - uses: actions/setup-python@v4 + - name: Check out repo + uses: actions/checkout@v5.0.0 + with: + fetch-depth: 0 + + - name: Install python + uses: actions/setup-python@v6.0.0 with: python-version: ${{ inputs.python }} - name: Install package From 7e81f4df329d61ece59694436ed2318364d27c94 Mon Sep 17 00:00:00 2001 From: Malik Irain Date: Fri, 6 Mar 2026 14:47:40 +0100 Subject: [PATCH 4/4] Update action dependancies list --- .github/workflows/Testbase.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/Testbase.yml b/.github/workflows/Testbase.yml index a230950..0a6872f 100644 --- a/.github/workflows/Testbase.yml +++ b/.github/workflows/Testbase.yml @@ -28,7 +28,7 @@ jobs: python-version: ${{ inputs.python }} - name: Install package run: | - sudo apt install libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xfixes0 x11-utils + sudo apt install -y yaru-theme-icon libxkbcommon-x11-0 libxcb-icccm4 libxcb-image0 libxcb-keysyms1 libxcb-cursor0 libxcb-randr0 libxcb-render-util0 libxcb-xinerama0 libxcb-xfixes0 x11-utils libgl1 libegl1 python -m pip install --upgrade pip export QT_DEBUG_PLUGINS=1 pip install flake8 pytest pytest-cov pytest-qt pytest-xdist pytest-xvfb setuptools wheel numpy h5py ${{ inputs.qt5 }} toml hatch