Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: m-labs/artiq
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 8df1b03f0f42
Choose a base ref
...
head repository: m-labs/artiq
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: ebf5699adf6d
Choose a head ref
  • 5 commits
  • 6 files changed
  • 2 contributors

Commits on Feb 5, 2015

  1. gitignore coverage

    jordens authored and sbourdeauducq committed Feb 5, 2015
    Copy the full SHA
    f848a7a View commit details
  2. add .travis.yml

    jordens authored and sbourdeauducq committed Feb 5, 2015
    2
    Copy the full SHA
    0a91f86 View commit details
  3. README.rst: add travis badge

    jordens authored and sbourdeauducq committed Feb 5, 2015
    Copy the full SHA
    695aa95 View commit details
  4. README.rst: add coveralls badge

    jordens authored and sbourdeauducq committed Feb 5, 2015
    Copy the full SHA
    17e4034 View commit details
  5. Copy the full SHA
    ebf5699 View commit details
Showing with 75 additions and 0 deletions.
  1. +1 −0 .gitignore
  2. +41 −0 .travis.yml
  3. +9 −0 .travis/get-anaconda.sh
  4. +11 −0 .travis/get-toolchain.sh
  5. +9 −0 .travis/get-xilinx.sh
  6. +4 −0 README.rst
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -8,3 +8,4 @@ doc/manual/_build
/build
/dist
/*.egg-info
/.coverage
41 changes: 41 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
language: python
python:
- '3.4'
env:
global:
- MSCDIR=$TRAVIS_BUILD_DIR/misoc
- PATH=$HOME/miniconda/bin:/usr/local/llvm-or1k/bin:$PATH
- CC=gcc-4.7
- CXX=g++-4.7
- ARTIQ_NO_HARDWARE=1
- secure: DgApzqX7Hidh+CVYVGDvXXc/a/SsF22t18YDx0KNqRKNQMBdeMEfAWMI1kXnPPxazItV4nljvrwOWaPaTY6wlJvV2r1W90zJsN8UVP8cMt2CudUiKBVRGvmr4Z6zhkifaEfzX9pLoCmHhLVyUjGlXPd0dC8GJVROp11FZm1l+rM=
before_install:
- ./.travis/get-toolchain.sh
- ./.travis/get-xilinx.sh
- ./.travis/get-anaconda.sh pip coverage numpy scipy sphinx
- source $HOME/miniconda/bin/activate py34
- sudo apt-get install --force-yes -y iverilog
- pip install --src . -e 'git+https://github.com/m-labs/migen.git@master#egg=migen'
- mkdir vpi
- iverilog-vpi --name=vpi/migensim migen/vpi/main.c migen/vpi/ipc.c
- git clone --recursive https://github.com/m-labs/misoc
- pip install --src . -e 'git+https://github.com/nist-ionstorage/llvmlite.git@artiq#egg=llvmlite'
- pip install coveralls
install:
- pip install -e .
script:
- coverage run --source=artiq setup.py test
- make -C doc/manual html || true
- cd misoc; python make.py -X ../soc -t artiq build-headers build-bios; cd ..
- make -C soc/runtime
- cd misoc; python make.py -X ../soc -t artiq build-bitstream; cd ..
after_success:
coveralls
notifications:
email: false
irc:
channels:
- chat.freenode.net#m-labs
webhooks:
urls:
- https://webhooks.gitter.im/e/d26782523952bfa53814
9 changes: 9 additions & 0 deletions .travis/get-anaconda.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/sh

wget http://repo.continuum.io/miniconda/Miniconda3-3.7.3-Linux-x86_64.sh -O miniconda.sh
bash miniconda.sh -b -p $HOME/miniconda
hash -r
conda config --set always_yes yes --set changeps1 no
conda update -q conda
conda info -a
conda create -q -n py34 python=$TRAVIS_PYTHON_VERSION $@
11 changes: 11 additions & 0 deletions .travis/get-toolchain.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
#!/bin/sh

sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test
sudo apt-add-repository -y "deb http://www.phys.ethz.ch/~robertjo/artiq-dev ./"
sudo apt-add-repository -y "deb http://archive.ubuntu.com/ubuntu saucy main universe"
sudo apt-get -qq --force-yes -y update
sudo apt-get install --force-yes -y gcc-4.7 g++-4.7 artiq-dev
or1k-elf-as --version
or1k-elf-gcc --version
clang --version
llvm-as --version || true
9 changes: 9 additions & 0 deletions .travis/get-xilinx.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
#!/bin/sh

wget http://www.phys.ethz.ch/~robertjo/xilinx_ise_14.7_s3_s6.tar.gz.gpg
echo "$secret" | gpg --passphrase-fd 0 xilinx_ise_14.7_s3_s6.tar.gz.gpg
sudo tar -C / -xzf xilinx_ise_14.7_s3_s6.tar.gz
wget http://www.phys.ethz.ch/~robertjo/xilinx_webpack.lic.gpg
echo "$secret" | gpg --passphrase-fd 0 xilinx_webpack.lic.gpg
mkdir ~/.Xilinx
mv xilinx_webpack.lic ~/.Xilinx/Xilinx.lic
4 changes: 4 additions & 0 deletions README.rst
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
.. image:: doc/logo/artiq.png
.. image:: https://travis-ci.org/nist-ionstorage/artiq.svg
:target: https://travis-ci.org/nist-ionstorage/artiq
.. image:: https://coveralls.io/repos/nist-ionstorage/artiq/badge.svg?branch=ci
:target: https://coveralls.io/r/nist-ionstorage/artiq?branch=ci

ARTIQ (Advanced Real-Time Infrastructure for Quantum physics) is a
next-generation control system for quantum information experiments. It is