m-labs · Oct 3, 2015 · Oct 3, 2015
Showing with 7 additions and 7 deletions.

+1 −1 artiq/master/scheduler.py

+2 −2 conda/artiq/meta.yaml

+1 −1 doc/manual/installing.rst

+1 −1 examples/master/repository/speed_benchmark.py

+2 −2 setup.py
diff --git a/artiq/master/scheduler.py b/artiq/master/scheduler.py
@@ -348,7 +348,7 @@ def stop(self):
 class Deleter(TaskObject):
     def __init__(self, pipelines):
         self._pipelines = pipelines
-        self._queue = asyncio.JoinableQueue()
+        self._queue = asyncio.Queue()
 
     def delete(self, rid):
         logger.debug("delete request for RID %d", rid)

diff --git a/conda/artiq/meta.yaml b/conda/artiq/meta.yaml
@@ -28,14 +28,14 @@ build:
 
 requirements:
     build:
-        - python >=3.4.3
+        - python >=3.4.4
         - setuptools
         - numpy
         - migen
         - pyelftools
         - binutils-or1k-linux
     run:
-        - python >=3.4.3
+        - python >=3.4.4
         - llvmlite-artiq
         - scipy
         - numpy

diff --git a/doc/manual/installing.rst b/doc/manual/installing.rst
@@ -369,7 +369,7 @@ This command installs all the required packages: ::
 
     $ sudo apt-get install build-essential autotools-dev file git patch perl xutils-dev python3-pip texinfo flex bison libmpc-dev python3-serial python3-dateutil python3-prettytable python3-setuptools python3-numpy python3-scipy python3-sphinx python3-h5py python3-dev python-dev subversion cmake libusb-dev libftdi-dev pkg-config libffi-dev libgit2-dev
 
-Note that ARTIQ requires Python 3.4.3 or above.
+Note that ARTIQ requires Python 3.4.4 or above.
 
 To set user permissions on the JTAG and serial ports of the Pipistrello, create a ``/etc/udev/rules.d/30-usb-papilio.rules`` file containing the following: ::
 

diff --git a/examples/master/repository/speed_benchmark.py b/examples/master/repository/speed_benchmark.py
@@ -78,7 +78,7 @@ def build(self):
                                                         "CoreSend100Ints",
                                                         "CoreSend1MB",
                                                         "CorePrimes"]))
-        self.attr_argument("nruns", NumberValue(10, min=1, max=1000))
+        self.attr_argument("nruns", NumberValue(10, min=1, max=1000, ndecimals=0))
         self.attr_device("core")
         self.attr_device("scheduler")
 

diff --git a/setup.py b/setup.py
@@ -5,8 +5,8 @@
 import os
 
 
-if sys.version_info[:3] < (3, 4, 3):
-    raise Exception("You need at least Python 3.4.3 to run ARTIQ")
+if sys.version_info[:3] < (3, 4, 4):
+    raise Exception("You need Python 3.4.4+")
 
 
 class PushDocCommand(Command):