Add support for allow_version_mismatch (L1-2516) #287
Merged
Conversation
This file contains 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
tobiasah
reviewed
Nov 22, 2024
src/zhinst/toolkit/session.py
Outdated
Comment on lines
997
to
1013
| # Attempt to pass the allow_version_mismatch flag. Fallback in case | ||
| # zhinst.core does not support it yet. | ||
| def _create_daq( | ||
| self, | ||
| server_host: str, | ||
| server_port: int, | ||
| allow_version_mismatch: bool, | ||
| ): |
There was a problem hiding this comment.
Suggested change
| # Attempt to pass the allow_version_mismatch flag. Fallback in case | |
| # zhinst.core does not support it yet. | |
| def _create_daq( | |
| self, | |
| server_host: str, | |
| server_port: int, | |
| allow_version_mismatch: bool, | |
| ): | |
| def _create_daq( | |
| self, | |
| server_host: str, | |
| server_port: int, | |
| allow_version_mismatch: bool, | |
| ): | |
| """Create a new session to the data server. | |
| Attempt to pass the allow_version_mismatch flag. Fallback in case | |
| zhinst.core does not support it yet.""" |
My idea was to do a two stages release. First with the flag present but disabled by default, the a second commit that "flips" the condition to enabled by default. For toolkit, maybe I can merge the "flipping" commit within this same PR |
fabiorossetto
force-pushed
the
fabior/version_mismatch
branch
4 times, most recently
from
0ebc513 to
9c9a47b
Compare
tobiasah
approved these changes
Nov 25, 2024
Comment on lines
296
to
304
|
|
||
| @staticmethod | ||
| def _create_daq(server_host, server_port): | ||
| try: | ||
| return ziDAQServer(server_host, server_port, 6, allow_version_mismatch=True) | ||
| except TypeError as error: | ||
| if "allow_version_mismatch" not in error.args[0]: | ||
| raise | ||
| return ziDAQServer(server_host, server_port, 6) |
fabiorossetto
force-pushed
the
fabior/version_mismatch
branch
2 times, most recently
from
2dff201 to
6f92343
Compare
added 2 commits
November 25, 2024 12:26
Expose the flag so that once it's changed to False by default, it can be overridden.
fabiorossetto
force-pushed
the
fabior/version_mismatch
branch
from
6f92343 to
6c16f7d
Compare
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.
Expose the flag so that once it's changed to False by default, it can be overridden.
Description:
Fixes issue: #
Checklist: