Merge branch 'master' into new-py2llvm

m-labs · Nov 20, 2015 · 28fa687 · 28fa687
2 parents 00ec574 + 51f04f6
commit 28fa687
Showing 20 changed files with 33 additions and 35 deletions.
diff --git a/artiq/frontend/artiq_client.py b/artiq/frontend/artiq_client.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.5
 
 import argparse
 import logging

diff --git a/artiq/frontend/artiq_compile.py b/artiq/frontend/artiq_compile.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.5
 
 import sys, logging, argparse
 

diff --git a/artiq/frontend/artiq_coretool.py b/artiq/frontend/artiq_coretool.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.5
 
 import argparse
 

diff --git a/artiq/frontend/artiq_ctlmgr.py b/artiq/frontend/artiq_ctlmgr.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.5
 
 import asyncio
 import atexit

diff --git a/artiq/frontend/artiq_flash.sh b/artiq/frontend/artiq_flash.sh
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3.5
 # conda-build requires all scripts to have a python shebang.
 # see https://github.com/conda/conda-build/blob/6921f067a/conda_build/noarch_python.py#L36-L38
 
@@ -13,7 +13,7 @@ def run(script):
 run("""
 set -e
 
-ARTIQ_PREFIX=$(python3 -c "import artiq; print(artiq.__path__[0])")
+ARTIQ_PREFIX=$(python3.5 -c "import artiq; print(artiq.__path__[0])")
 
 # Default is kc705
 BOARD=kc705

diff --git a/artiq/frontend/artiq_gui.py b/artiq/frontend/artiq_gui.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.5
 
 import argparse
 import asyncio

diff --git a/artiq/frontend/artiq_influxdb.py b/artiq/frontend/artiq_influxdb.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.5
 
 import argparse
 import logging

diff --git a/artiq/frontend/artiq_master.py b/artiq/frontend/artiq_master.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.5
 
 import asyncio
 import argparse

diff --git a/artiq/frontend/artiq_mkfs.py b/artiq/frontend/artiq_mkfs.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.5
 
 import argparse
 import struct

diff --git a/artiq/frontend/artiq_rpctool.py b/artiq/frontend/artiq_rpctool.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.5
 
 import argparse
 import textwrap

diff --git a/artiq/frontend/artiq_run.py b/artiq/frontend/artiq_run.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.5
 # Copyright (C) 2014, 2015 M-Labs Limited
 # Copyright (C) 2014, 2015 Robert Jordens <jordens@gmail.com>
 

diff --git a/artiq/frontend/lda_controller.py b/artiq/frontend/lda_controller.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.5
 
 import argparse
 

diff --git a/artiq/frontend/novatech409b_controller.py b/artiq/frontend/novatech409b_controller.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.5
 
 # Written by Joe Britton, 2015
 

diff --git a/artiq/frontend/pdq2_controller.py b/artiq/frontend/pdq2_controller.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.5
 
 import argparse
 import sys

diff --git a/artiq/frontend/pxi6733_controller.py b/artiq/frontend/pxi6733_controller.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.5
 # Yann Sionneau <ys@m-labs.hk>, 2015
 
 import argparse

diff --git a/artiq/frontend/thorlabs_tcube_controller.py b/artiq/frontend/thorlabs_tcube_controller.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.5
 
 import argparse
 import sys

diff --git a/artiq/gateware/targets/kc705.py b/artiq/gateware/targets/kc705.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.5
 
 import argparse
 import os

diff --git a/artiq/gateware/targets/pipistrello.py b/artiq/gateware/targets/pipistrello.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python3
+#!/usr/bin/env python3.5
 
 # Copyright (C) 2014, 2015 Robert Jordens <jordens@gmail.com>
 # Copyright (C) 2014, 2015 M-Labs Limited

diff --git a/artiq/runtime/Makefile b/artiq/runtime/Makefile
@@ -1,7 +1,7 @@
 include ../include/generated/variables.mak
 include $(MISOC_DIRECTORY)/software/common.mak
 
-PYTHON ?= python3
+PYTHON ?= python3.5
 
 OBJECTS := isr.o clock.o rtiocrg.o flash_storage.o mailbox.o \
 	session.o log.o moninj.o net_server.o bridge_ctl.o \

diff --git a/doc/manual/installing.rst b/doc/manual/installing.rst
@@ -174,7 +174,7 @@ These steps are required to generate bitstream (``.bit``) files, build the MiSoC
         $ cd ~/artiq-dev
         $ git clone https://github.com/m-labs/migen
         $ cd migen
-        $ python3 setup.py develop --user
+        $ python3.5 setup.py develop --user
 
 .. note::
     The options ``develop`` and ``--user`` are for setup.py to install Migen in ``~/.local/lib/python3.5``.
@@ -225,14 +225,14 @@ These steps are required to generate bitstream (``.bit``) files, build the MiSoC
         $ cd ~/artiq-dev
         $ git clone --recursive https://github.com/m-labs/misoc
         $ cd misoc
-        $ python3 setup.py develop --user
+        $ python3.5 setup.py develop --user
 
 * Download and install ARTIQ: ::
 
         $ cd ~/artiq-dev
         $ git clone --recursive https://github.com/m-labs/artiq
         $ cd artiq
-        $ python3 setup.py develop --user
+        $ python3.5 setup.py develop --user
 
 .. note::
     If you have any trouble during ARTIQ setup about ``pygit2`` installation,
@@ -250,11 +250,11 @@ These steps are required to generate bitstream (``.bit``) files, build the MiSoC
 
     * For Pipistrello::
 
-        $ python3 -m artiq.gateware.targets.pipistrello
+        $ python3.5 -m artiq.gateware.targets.pipistrello
 
     * For KC705::
 
-        $ python3 -m artiq.gateware.targets.kc705 -H qc1  # or qc2
+        $ python3.5 -m artiq.gateware.targets.kc705 -H qc1  # or qc2
 
 * Then, gather the binaries and flash them: ::
 
@@ -291,30 +291,30 @@ Installing the host-side software
         $ git clone https://github.com/m-labs/llvmlite
         $ git checkout artiq
         $ cd llvmlite
-        $ LLVM_CONFIG=/usr/local/llvm-or1k/bin/llvm-config python3 setup.py install --user
+        $ LLVM_CONFIG=/usr/local/llvm-or1k/bin/llvm-config python3.5 setup.py install --user
 
 * Install ARTIQ: ::
 
         $ cd ~/artiq-dev
         $ git clone --recursive https://github.com/m-labs/artiq # if not already done
         $ cd artiq
-        $ python3 setup.py develop --user
+        $ python3.5 setup.py develop --user
 
 .. note::
     If you have any trouble during ARTIQ setup about ``pygit2`` installation,
     you can install it by using ``pip``:
 
     On Ubuntu 14.04::
 
-        $ pip install --user pygit2==0.19.1
+        $ python3.5 `which pip3` install --user pygit2==0.19.1
 
     On Ubuntu 14.10::
 
-        $ pip install --user pygit2==0.20.3
+        $ python3.5 `which pip3` install --user pygit2==0.20.3
 
     On Ubuntu 15.04 and 15.10::
 
-        $ pip install --user pygit2==0.22.1
+        $ python3.5 `which pip3` install --user pygit2==0.22.1
 
     The rationale behind this is that pygit2 and libgit2 must have the same
     major.minor version numbers.
@@ -408,14 +408,12 @@ The core device may use either an external clock signal or its internal clock. T
     $ artiq_coretool cfg-write -s startup_clock i  # internal clock (default)
     $ artiq_coretool cfg-write -s startup_clock e  # external clock
 
-Ubuntu 14.04 specific instructions
-----------------------------------
+Ubuntu 15.10+/Debian jessie+ specific instructions
+--------------------------------------------------
 
 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.5.0 or above.
+    $ sudo apt-get install build-essential autotools-dev file git patch perl xutils-dev texinfo flex bison libmpc-dev subversion cmake libusb-dev libftdi-dev pkg-config libffi-dev libgit2-dev python3.5 python3.5-dev
 
 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: ::