Skip to content
This repository has been archived by the owner on Oct 14, 2022. It is now read-only.

Commit

Permalink
ARTIQ-5 compatibility
Browse files Browse the repository at this point in the history
  • Loading branch information
@sbourdeauducq
sbourdeauducq committed Apr 19, 2019
1 parent 8224f69 commit 2d97eb7
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion newfocus8742/aqctl_newfocus8742.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ def get_argparser():
help="simulation device")

tools.simple_network_args(parser, 3257)
tools.verbosity_args(parser)
tools.add_common_args(parser)
return parser


Expand Down

3 comments on commit 2d97eb7

@jordens
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That breaks the package on the stable release-4. Since there is no ARTIQ-5 yet that's problematic. Let's either add a compat shim (to release-4 or master) or back this change out until ARTIQ-5.

@sbourdeauducq
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Or make that package compatible with both -4 and -5, since that's obviously what you want. Something like that:

getattr(tools, "add_common_args", getattr(tools, "verbosity_args", None))(parser)

This way it is also compatible with 4.0 and all development versions of -5.

@jordens
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I am not yet interested in using this package on ARTIQ-5 or master. And you'd probably want to write that readable and with better future behavior using a try: except:.

Please sign in to comment.