rpctool: make readline optional, add to conda dependencies. Closes #442

m-labs · May 25, 2016 · 8d0034e · 8d0034e
1 parent aa26b13
commit 8d0034e
Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/artiq/frontend/artiq_rpctool.py b/artiq/frontend/artiq_rpctool.py
@@ -5,7 +5,6 @@
 import sys
 import traceback
 import numpy as np  # Needed to use numpy in RPC call arguments on cmd line
-import readline  # This makes input() nicer
 import pprint
 
 from artiq.protocols.pc_rpc import AutoTarget, Client, RemoteError
@@ -87,6 +86,12 @@ def call_method(remote, method_name, args):
 
 
 def interactive(remote):
+    try:
+        import readline  # This makes input() nicer
+    except ImportError:
+        print("Warning: readline not available. "
+              "Install it to add line editing capabilities.")
+
     while True:
         try:
             cmd = input("({}) ".format(remote.get_selected_target()))

diff --git a/conda/artiq/meta.yaml b/conda/artiq/meta.yaml
@@ -37,6 +37,8 @@ requirements:
     - binutils-or1k-linux
   run:
     - python >=3.5.1
+    - readline # [linux]
+    - pyreadline # [win]
     - llvmlite-artiq 0.10.0.dev py35_24
     - scipy
     - numpy