M-Labs
/
artiq
mirror of https://github.com/m-labs/artiq.git
2
0
Fork 2
Code Issues Projects Releases Wiki Activity

do not use deprecated asyncio.JoinableQueue

This commit is contained in:
Sebastien Bourdeauducq 2015-10-03 13:59:18 +08:00
parent 34b9f7e901
commit cd3107ba75
4 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
artiq/master/scheduler.py
View File

@ -348,7 +348,7 @@ class Pipeline:
class Deleter(TaskObject): class Deleter(TaskObject):
def __init__(self, pipelines): def __init__(self, pipelines):
self._pipelines = pipelines self._pipelines = pipelines
self._queue = asyncio.JoinableQueue() self._queue = asyncio.Queue()
def delete(self, rid): def delete(self, rid):
logger.debug("delete request for RID %d", rid) logger.debug("delete request for RID %d", rid)

4
conda/artiq/meta.yaml
View File

@ -28,14 +28,14 @@ build:
requirements: requirements:
build: build:
- python >=3.4.3 - python >=3.4.4
- setuptools - setuptools
- numpy - numpy
- migen - migen
- pyelftools - pyelftools
- binutils-or1k-linux - binutils-or1k-linux
run: run:
- python >=3.4.3 - python >=3.4.4
- llvmlite-artiq - llvmlite-artiq
- scipy - scipy
- numpy - numpy

2
doc/manual/installing.rst
View File

@ -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 $ 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: :: 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: ::

4
setup.py
View File

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