diff --git a/highfinesse_net/aqctl_highfinesse_net.py b/highfinesse_net/aqctl_highfinesse_net.py index 8aa72e4..1e3d524 100755 --- a/highfinesse_net/aqctl_highfinesse_net.py +++ b/highfinesse_net/aqctl_highfinesse_net.py @@ -7,8 +7,8 @@ from .wavemeter import Wavemeter -from artiq.protocols.pc_rpc import Server -from artiq import tools +from sipyco.pc_rpc import simple_server_loop +from sipyco import common_args logger = logging.getLogger(__name__) @@ -20,17 +20,14 @@ def get_argparser(): parser.add_argument( "-d", "--device", default=None, help="Device host name or IP address.") - tools.simple_network_args(parser, 3273) - if hasattr(tools, "add_common_args"): - tools.add_common_args(parser) # ARTIQ-5 - else: - tools.verbosity_args(parser) # ARTIQ-4 + common_args.simple_network_args(parser, 3273) + common_args.verbosity_args(parser) # ARTIQ-4 return parser def main(): args = get_argparser().parse_args() - tools.init_logger(args) + common_args.init_logger_from_args(args) if args.device is None: print("You need to supply a -d/--device " @@ -42,7 +39,7 @@ def main(): async def run(): with await Wavemeter.connect(args.device, loop=loop) as dev: server = Server({"wavemeter": dev}, None, True) - await server.start(tools.bind_address_from_args(args), args.port) + await server.start(common_args.bind_address_from_args(args), args.port) try: await server.wait_terminate() finally: diff --git a/setup.py b/setup.py index acd85e2..0e8b77b 100755 --- a/setup.py +++ b/setup.py @@ -7,7 +7,7 @@ setup( name="highfinesse-net", - version="0.1", + version="0.2", description="Driver for HighFinesse Wavement used in opticlock", long_description=open("README.rst").read(), author="Robert Jördens", @@ -15,7 +15,7 @@ url="https://github.com/quartiq/highfinesse-net", download_url="https://github.com/quartiq/highfinesse-net", packages=find_packages(), - install_requires=[], + install_requires=["sipyco"], entry_points={ "console_scripts": [ "aqctl_highfinesse_net = highfinesse_net.aqctl_highfinesse_net:main",