Repository navigation
Merge 5.0.x into main (PyMoDAQ 5 code port) - #4
Merged
Merged
Conversation
Keeps main's pyproject/hatch packaging (PyMoDAQ 5.3, daqmx>=1.1,<5), brings in the 5.0.x code changes, enables the extensions feature (mokemicro) and adds pillow. Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01RKuN81tBxMB6iaf8J6KLJL
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
5.0.xcarried the actual PyMoDAQ 5 code port (done in Jan. 2025) thatmainlacked, whilemaingot the 5.3 packaging and shared tests. This merges5.0.xintomain.Conflict resolution
pyproject.toml: keptmain(PyMoDAQ >= 5.3.2,pymodaq_plugins_daqmx>=1.1,<5, python >= 3.10); setextensions = true(themokemicroextension lives inextensions/) and added thepillowdependency from 5.0.x.__init__.py: keptmain's version..flake8: kept (renamed fromtox.inionmain).Brought in from 5.0.x
mokemicro.pymoved toextensions/and updated to the PyMoDAQ 5 APIplugins_ND/__init__.pyremoved,config_template.tomlupdateNot run locally (no Qt/EGL in my environment); relying on CI.
Next steps
After merge: create the
pydaqmxmaintenance branch from the merge commit and tag it.Generated by Claude Code