move to sipyco

quartiq · Dec 19, 2019 · 334888b · 334888b
1 parent ac5e441
commit 334888b
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 28 deletions.
diff --git a/ptb/aqctl_ptb_shutter.py b/ptb/aqctl_ptb_shutter.py
@@ -7,13 +7,12 @@
 
 from .shutter_tcp import ShutterTCP as Shutter
 
-from artiq.protocols.pc_rpc import Server
-from artiq.tools import (simple_network_args, init_logger,
-                         bind_address_from_args)
-try:
-    from artiq.tools import verbosity_args
-except ImportError:
-    from artiq.tools import add_common_args as verbosity_args
+from sipyco.pc_rpc import Server
+from sipyco import common_args
+
+from sipyco.common_args import (
+    simple_network_args, init_logger_from_args as init_logger,
+    bind_address_from_args, verbosity_args)
 
 
 logger = logging.getLogger(__name__)

diff --git a/ptb/aqctl_ptb_synth.py b/ptb/aqctl_ptb_synth.py
@@ -7,13 +7,12 @@
 
 from .synth_tcp import SynthTCP as Synth
 
-from artiq.protocols.pc_rpc import Server
-from artiq.tools import (simple_network_args, init_logger,
-                         bind_address_from_args)
-try:
-    from artiq.tools import verbosity_args
-except ImportError:
-    from artiq.tools import add_common_args as verbosity_args
+from sipyco.pc_rpc import Server
+from sipyco import common_args
+
+from sipyco.common_args import (
+    simple_network_args, init_logger_from_args as init_logger,
+    bind_address_from_args, verbosity_args)
 
 
 logger = logging.getLogger(__name__)

diff --git a/ptb/aqctl_ptb_temp.py b/ptb/aqctl_ptb_temp.py
@@ -7,13 +7,12 @@
 
 from .temp_tcp import TempTCP as Temp
 
-from artiq.protocols.pc_rpc import Server
-from artiq.tools import (simple_network_args, init_logger,
-                         bind_address_from_args)
-try:
-    from artiq.tools import verbosity_args
-except ImportError:
-    from artiq.tools import add_common_args as verbosity_args
+from sipyco.pc_rpc import Server
+from sipyco import common_args
+
+from sipyco.common_args import (
+    simple_network_args, init_logger_from_args as init_logger,
+    bind_address_from_args, verbosity_args)
 
 
 logger = logging.getLogger(__name__)

diff --git a/ptb/aqctl_ptb_voltage.py b/ptb/aqctl_ptb_voltage.py
@@ -7,13 +7,12 @@
 
 from .voltage_tcp import VoltageTCP as Voltage
 
-from artiq.protocols.pc_rpc import Server
-from artiq.tools import (simple_network_args, init_logger,
-                         bind_address_from_args)
-try:
-    from artiq.tools import verbosity_args
-except ImportError:
-    from artiq.tools import add_common_args as verbosity_args
+from sipyco.pc_rpc import Server
+from sipyco import common_args
+
+from sipyco.common_args import (
+    simple_network_args, init_logger_from_args as init_logger,
+    bind_address_from_args, verbosity_args)
 
 
 logger = logging.getLogger(__name__)