Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit ac134bb

Browse files
committedJul 31, 2015
Merge master
2 parents 9492802 + 89343ae commit ac134bb

File tree

163 files changed

+4944
-2109
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

163 files changed

+4944
-2109
lines changed
 

Diff for: ‎.travis.yml

+10-8
Original file line numberDiff line numberDiff line change
@@ -13,26 +13,28 @@ before_install:
1313
- . ./.travis/get-toolchain.sh
1414
- . ./.travis/get-anaconda.sh
1515
- source $HOME/miniconda/bin/activate py34
16-
- conda install pip coverage binstar migen cython
16+
- conda install -q pip coverage anaconda-client migen cython
1717
- pip install coveralls
1818
install:
1919
- conda build conda/artiq
20-
- conda install $HOME/miniconda/conda-bld/linux-64/artiq-*.tar.bz2
20+
- conda install -q artiq --use-local
2121
script:
2222
- coverage run --source=artiq setup.py test
2323
- make -C doc/manual html
2424
after_success:
25-
- binstar login --hostname $(hostname) --username $binstar_login --password $binstar_password
26-
- binstar upload --user $binstar_login --channel dev --force $HOME/miniconda/conda-bld/linux-64/artiq-*.tar.bz2
25+
- anaconda -q login --hostname $(hostname) --username $binstar_login --password $binstar_password
26+
- anaconda -q upload --user $binstar_login --channel dev --force $HOME/miniconda/conda-bld/linux-64/artiq-*.tar.bz2
27+
- anaconda -q logout
2728
- coveralls
2829
notifications:
29-
email: false
30+
email:
31+
recipients:
32+
- rjordens@nist.gov
33+
on_success: always
34+
on_failure: never
3035
irc:
3136
channels:
3237
- chat.freenode.net#m-labs
3338
template:
3439
- "%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message}"
3540
- "Build details : %{build_url}"
36-
webhooks:
37-
urls:
38-
- https://webhooks.gitter.im/e/d26782523952bfa53814

Diff for: ‎.travis/get-anaconda.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ conda info -a
1010
conda install conda-build jinja2
1111
conda create -q -n py34 python=$TRAVIS_PYTHON_VERSION
1212
conda config --add channels fallen
13-
conda config --add channels https://conda.binstar.org/fallen/channel/dev
13+
conda config --add channels https://conda.anaconda.org/fallen/channel/dev

0 commit comments

Comments
 (0)
Please sign in to comment.