From 6d4b9e5fcaa04fab5cc8eec7d4a9fc7bd0e760b6 Mon Sep 17 00:00:00 2001 From: Sebastien Bourdeauducq Date: Thu, 12 Feb 2015 09:34:17 +0800 Subject: [PATCH] frontend: remove lda_client (use artiq_rpctool instead) --- artiq/frontend/lda_client.py | 31 ------------------------------- conda/artiq/meta.yaml | 3 +-- doc/manual/drivers_reference.rst | 5 ----- setup.py | 3 +-- 4 files changed, 2 insertions(+), 40 deletions(-) delete mode 100755 artiq/frontend/lda_client.py diff --git a/artiq/frontend/lda_client.py b/artiq/frontend/lda_client.py deleted file mode 100755 index c0555a2d5..000000000 --- a/artiq/frontend/lda_client.py +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env python3 - -import argparse - -from artiq.protocols.pc_rpc import Client - - -def get_argparser(): - parser = argparse.ArgumentParser() - parser.add_argument("-s", "--server", default="::1", - help="hostname or IP of the controller to connect to") - parser.add_argument("-p", "--port", default=3253, type=int, - help="TCP port to use to connect to the controller") - parser.add_argument("-a", "--attenuation", type=float, - help="attenuation value to set") - return parser - - -def main(): - args = get_argparser().parse_args() - remote = Client(args.server, args.port, "lda") - try: - if args.attenuation is None: - print("Current attenuation: {}".format(remote.get_attenuation())) - else: - remote.set_attenuation(args.attenuation) - finally: - remote.close_rpc() - -if __name__ == "__main__": - main() diff --git a/conda/artiq/meta.yaml b/conda/artiq/meta.yaml index e1107e24a..67f8df57e 100644 --- a/conda/artiq/meta.yaml +++ b/conda/artiq/meta.yaml @@ -11,11 +11,10 @@ build: string: dev entry_points: - artiq_client = artiq.frontend.artiq_client:main - - artiq_rpctool = artiq.frontend.artiq_rpctool:main - artiq_gui = artiq.frontend.artiq_gui:main # [not win] - artiq_master = artiq.frontend.artiq_master:main + - artiq_rpctool = artiq.frontend.artiq_rpctool:main - artiq_run = artiq.frontend.artiq_run:main - - lda_client = artiq.frontend.lda_client:main - lda_controller = artiq.frontend.lda_controller:main - pdq2_client = artiq.frontend.pdq2_client:main - pdq2_controller = artiq.frontend.pdq2_controller:main diff --git a/doc/manual/drivers_reference.rst b/doc/manual/drivers_reference.rst index cfa06cf5b..a2311c13d 100644 --- a/doc/manual/drivers_reference.rst +++ b/doc/manual/drivers_reference.rst @@ -35,11 +35,6 @@ Each driver is run in a separate "controller" that exposes a RPC interface (base :ref: artiq.frontend.lda_controller.get_argparser :prog: lda_controller - -.. argparse:: - :ref: artiq.frontend.lda_client.get_argparser - :prog: lda_client - Default TCP port list --------------------- diff --git a/setup.py b/setup.py index 0afb79417..4d1f8d417 100755 --- a/setup.py +++ b/setup.py @@ -10,11 +10,10 @@ requirements = [ ] scripts = [ "artiq_client=artiq.frontend.artiq_client:main", - "artiq_rpctool=artiq.frontend.artiq_rpctool:main", "artiq_ctlmgr=artiq.frontend.artiq_ctlmgr:main", "artiq_master=artiq.frontend.artiq_master:main", + "artiq_rpctool=artiq.frontend.artiq_rpctool:main", "artiq_run=artiq.frontend.artiq_run:main", - "lda_client=artiq.frontend.lda_client:main", "lda_controller=artiq.frontend.lda_controller:main", "pdq2_client=artiq.frontend.pdq2_client:main", "pdq2_controller=artiq.frontend.pdq2_controller:main",