srenblad
/
artiq
forked from M-Labs/artiq
1
0
Fork 0
Code Pull Requests Activity

Merge branch 'master' of github.com:m-labs/artiq

This commit is contained in:
Sebastien Bourdeauducq 2015-05-14 00:16:27 +08:00
parent cbb5027343 a62ae1d8d7
commit e557d7e2df
3 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@ -16,7 +16,7 @@ before_install:
- ./.travis/get-anaconda.sh - ./.travis/get-anaconda.sh
- source $HOME/miniconda/bin/activate py34 - source $HOME/miniconda/bin/activate py34
- sudo apt-get install --force-yes -y iverilog - sudo apt-get install --force-yes -y iverilog
- conda install pip coverage binstar migen cython conda-build jinja2 - conda install pip coverage binstar migen cython
- pip install coveralls - pip install coveralls
install: install:
- conda build conda/artiq - conda build conda/artiq

1
.travis/get-anaconda.sh
View File

@ -6,5 +6,6 @@ hash -r
conda config --set always_yes yes --set changeps1 no conda config --set always_yes yes --set changeps1 no
conda update -q conda conda update -q conda
conda info -a conda info -a
conda install conda-build jinja2
conda create -q -n py34 python=$TRAVIS_PYTHON_VERSION conda create -q -n py34 python=$TRAVIS_PYTHON_VERSION
conda config --add channels fallen conda config --add channels fallen

4
artiq/test/transforms.py
View File

@ -34,7 +34,11 @@ def run():
optimize_out = """ optimize_out = """
def run(): def run():
now = syscall('now_init')
try:
do_something(344) do_something(344)
finally:
syscall('now_save', now)
""" """