Merge branch 'master' of https://github.com/qdev-dk/Qcodes into array…

…_val
microsoft · Sep 23, 2016 · 8efc95b · 8efc95b
2 parents 90406fc + 474158b
commit 8efc95b
Show file tree

Hide file tree

Showing 9 changed files with 3,209 additions and 42 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -21,13 +21,11 @@ script:
     - python  qcodes/test.py --skip-coverage
     - python  qcodes/test.py --mp-spawn
 after_success:
-    # codecov
+    # install codacy coverage plugin only on traivs
+    - pip install codacy-coverage
     - cd qcodes
     - coverage xml
     - python-codacy-coverage -r coverage.xml
-    # codecvo
-    - bash <(curl -s https://codecov.io/bash) -t c3b231db-2db3-4560-a477-6edcf4cf5ad1
-    #
     # build the docs, one dir up
     - cd ../ 
     - make -f docs/Makefile gh-pages
diff --git a/docs/examples/Qcodes example ATS_ONWORK.ipynb b/docs/examples/Qcodes example ATS_ONWORK.ipynb