Skip to content

Keep the replaced plugins in a legacy folder - #34

Merged
seb5g merged 4 commits into
5.0.xfrom
feature/andor-legacy-plugins
Nov 4, 2026
Merged

seb5g merged 4 commits into
5.0.xfrom
feature/andor-legacy-plugins

Conversation

@seb5g

@seb5g seb5g commented Nov 4, 2026

Copy link
Copy Markdown
Contributor

Before: PR #32 removed four plugins (Andor CCD SDK2, Shamrock, ShamrockCCD, ShamrockCCDLegacy) when it added the pylablib based ones, so they were only reachable through the git history.

After: the four modules, as they were before #32, are in src/pymodaq_plugins_andor/legacy/, with a README and a short "Legacy" section in the package README. This folder is outside daq_move_plugins and daq_viewer_plugins, so PyMoDAQ does not load them: they are not runnable as they are, only kept around.

How: the files are copied unchanged from the commit before #32; only the imports between them point to the legacy folder.

Tested: no hardware and no PyMoDAQ run. check_plugin does not scan the new folder. Not done: daq_1Dviewer_ShamrockSCMOS.py and daq_1Dviewer_ShamrockSCMOSLegacy.py (still in the viewer folder) import daq_move_plugins.daq_move_Shamrock, which #32 removed, so they cannot be imported on 5.0.x today; I left them unchanged.


Generated by Claude Code

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Tdiso1u1ZhikSutj2Qs5Cg

seb5g commented Nov 4, 2026

Copy link
Copy Markdown
Contributor Author

The tests / tests job and the compatibility jobs are red, and they are red on 5.0.x at the merge of #32 (c93b63a) too, so this PR (which only adds a folder outside the plugin folders) does not cause it. I could not read the job logs. A local check_plugin run shows two likely causes, both from #32: daq_1Dviewer_ShamrockSCMOS and ShamrockSCMOSLegacy import daq_move_plugins.daq_move_Shamrock, which #32 removed, and the new Pll plugins import pymodaq_plugins_utils, which is not installed by the package dependencies. I did not widen this PR to fix them: both need a decision of the maintainer (where daq_move_Shamrock should live, and the dependency).


Generated by Claude Code

…eclare them Windows only

Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Tdiso1u1ZhikSutj2Qs5Cg

seb5g commented Nov 4, 2026

Copy link
Copy Markdown
Contributor Author

Correction to my previous comment: the Pll plugins' dependency pymodaq-plugins-utils is declared in pyproject.toml. It was missing only in my local environment, so it is not a cause of the red CI. The daq_move_Shamrock import is fixed in #35 (stacked on this PR).


Generated by Claude Code

claude and others added 2 commits November 4, 2026 15:39
Use the pylablib Shamrock actuator in the ShamrockSCMOS plugin
@seb5g
seb5g merged commit 6d1e9bb into 5.0.x Nov 4, 2026
0 of 7 checks passed
@seb5g
seb5g deleted the feature/andor-legacy-plugins branch November 4, 2026 15:44

seb5g commented Nov 4, 2026

Copy link
Copy Markdown
Contributor Author

Pushed a fix for the three IndexError: list index out of range import failures of the CI tests (daq_move_ShamrockPll, daq_1Dviewer_ShamrockCCDPll, daq_2Dviewer_AndorCCDPll): the class bodies took SPEC_NAMES[0] / CAM_NAMES[0], which is empty when no spectrometer or camera is found (a CI runner, or a computer without the driver). The default value is now '' in that case; AndorSCMOSPll had the same line and got the same change. Not run against pylablib or any hardware.


Generated by Claude Code

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants