Merge pull request #51 from AdriaanRol/hotfix/qcodes_tests

hotfix_qcodes_dep
AdriaanRol · Nov 10, 2017 · 0b11c1e · 0b11c1e
2 parents bec23aa + 309abc1
commit 0b11c1e
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/.travis.yml b/.travis.yml
@@ -34,7 +34,7 @@ install:
 
     - pip install --upgrade pip
     - pip install -r requirements.txt
-    - pip install git+git://github.com/DiCarloLab-Delft/Qcodes.git
+    - pip install jsonschema # missing dependency in qcodes
     - pip install coverage pytest-cov pytest --upgrade
     - pip install codacy-coverage
     - pip install -e .

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,5 @@
 numpy
+qcodes
 PyYAML
 networkx
 matplotlib