m-labs · Dec 20, 2015 · Dec 20, 2015 · Dec 20, 2015
Showing with 11 additions and 16 deletions.

+4 −0 artiq/frontend/artiq_coretool.py

+1 −2 artiq/protocols/logging.py

+0 −2 artiq/protocols/sync_struct.py

+1 −7 artiq/tools.py

+2 −2 conda/artiq/meta.yaml

+3 −3 setup.py
diff --git a/artiq/frontend/artiq_coretool.py b/artiq/frontend/artiq_coretool.py
@@ -3,6 +3,7 @@
 import argparse
 import struct
 
+from artiq.tools import verbosity_args, init_logger
 from artiq.master.databases import DeviceDB
 from artiq.master.worker_db import DeviceManager
 from artiq.coredevice.analyzer import decode_dump, messages_to_vcd
@@ -11,6 +12,8 @@
 def get_argparser():
     parser = argparse.ArgumentParser(description="ARTIQ core device "
                                                  "remote access tool")
+
+    verbosity_args(parser)
     parser.add_argument("--device-db", default="device_db.pyon",
                        help="device database file (default: '%(default)s')")
 
@@ -58,6 +61,7 @@ def get_argparser():
 
 def main():
     args = get_argparser().parse_args()
+    init_logger(args)
     device_mgr = DeviceManager(DeviceDB(args.device_db))
     try:
         comm = device_mgr.get("comm")

diff --git a/artiq/protocols/logging.py b/artiq/protocols/logging.py
@@ -2,7 +2,7 @@
 import logging
 
 from artiq.protocols.asyncio_server import AsyncioServer
-from artiq.tools import TaskObject, workaround_asyncio263
+from artiq.tools import TaskObject
 
 
 logger = logging.getLogger(__name__)
@@ -123,7 +123,6 @@ async def _do(self):
                 while True:
                     message = await self._queue.get() + "\n"
                     writer.write(message.encode())
-                    await workaround_asyncio263()
                     await writer.drain()
             except asyncio.CancelledError:
                 return

diff --git a/artiq/protocols/sync_struct.py b/artiq/protocols/sync_struct.py
@@ -16,7 +16,6 @@
 
 from artiq.protocols import pyon
 from artiq.protocols.asyncio_server import AsyncioServer
-from artiq.tools import workaround_asyncio263
 
 
 _init_string = b"ARTIQ sync_struct\n"
@@ -233,7 +232,6 @@ async def _handle_connection_cr(self, reader, writer):
                     line = await queue.get()
                     writer.write(line)
                     # raise exception on connection error
-                    await workaround_asyncio263()
                     await writer.drain()
             finally:
                 self._recipients[notifier_name].remove(queue)

diff --git a/artiq/tools.py b/artiq/tools.py
@@ -19,7 +19,7 @@
 __all__ = ["artiq_dir", "parse_arguments", "elide", "short_format", "file_import",
            "get_experiment", "verbosity_args", "simple_network_args", "init_logger",
            "atexit_register_coroutine", "exc_to_warning", "asyncio_wait_or_cancel",
-           "TaskObject", "Condition", "workaround_asyncio263", "get_windows_drives"]
+           "TaskObject", "Condition", "get_windows_drives"]
 
 
 logger = logging.getLogger(__name__)
@@ -195,12 +195,6 @@ def notify(self):
                 fut.set_result(False)
 
 
-# See: https://github.com/python/asyncio/issues/263
-@asyncio.coroutine
-def workaround_asyncio263():
-    yield
-
-
 def get_windows_drives():
     from ctypes import windll
 

diff --git a/conda/artiq/meta.yaml b/conda/artiq/meta.yaml
@@ -29,13 +29,13 @@ build:
 
 requirements:
   build:
-    - python >=3.5.0
+    - python >=3.5.1
     - setuptools
     - numpy
     - pyelftools
     - binutils-or1k-linux
   run:
-    - python >=3.5.0
+    - python >=3.5.1
     - llvmlite-artiq
     - scipy
     - numpy

diff --git a/setup.py b/setup.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.5
 
 from setuptools import setup, find_packages
 import sys
@@ -7,8 +7,8 @@
 import versioneer
 
 
-if sys.version_info[:3] < (3, 5, 0):
-    raise Exception("You need Python 3.5.0+")
+if sys.version_info[:3] < (3, 5, 1):
+    raise Exception("You need Python 3.5.1+")
 
 
 requirements = [