From 15ff2386a9201d9d710c42661c8738ef0d60ed19 Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Mon, 13 Nov 2017 11:20:07 +0100 Subject: [PATCH 1/3] jsonschema is needed not only for docs build --- docs_requirements.txt | 1 - requirements.txt | 1 + setup.py | 3 ++- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/docs_requirements.txt b/docs_requirements.txt index a8abb189efe..e9b853631b8 100644 --- a/docs_requirements.txt +++ b/docs_requirements.txt @@ -1,6 +1,5 @@ sphinx sphinx_rtd_theme -jsonschema sphinxcontrib-jsonschema nbconvert ipython diff --git a/requirements.txt b/requirements.txt index 32d5add6fb3..5a4616d3b29 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,3 +6,4 @@ PyQt5==5.9 sip==4.19.3 QtPy==1.3.1 h5py==2.7.1 +jsonschema diff --git a/setup.py b/setup.py index d8ca9bf8632..2dcd4cef701 100644 --- a/setup.py +++ b/setup.py @@ -61,7 +61,8 @@ def readme(): 'numpy>=1.10', 'pyvisa>=1.8', 'h5py>=2.6', - 'websockets>=3.2,<3.4' + 'websockets>=3.2,<3.4', + 'jsonschema' ], test_suite='qcodes.tests', From 8b6626789e191e96a6349f65b0b3d388bf2defed Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Mon, 13 Nov 2017 11:23:34 +0100 Subject: [PATCH 2/3] Bump numpy and pyqt/sip to latest bug fix release --- requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 5a4616d3b29..3adc4241b9c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,9 +1,9 @@ -numpy==1.13.1 +numpy==1.13.3 matplotlib==2.0.2 pyqtgraph==0.10.0 PyVISA==1.8 -PyQt5==5.9 -sip==4.19.3 +PyQt5==5.9.1 +sip==4.19.5 QtPy==1.3.1 h5py==2.7.1 jsonschema From b0274d8742ff44efb3b4020317b1c4a504dd65d7 Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Mon, 13 Nov 2017 13:03:35 +0100 Subject: [PATCH 3/3] Latest version of pyqt is not on linux yet --- requirements.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 3adc4241b9c..77f0dd3edbc 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,8 +2,8 @@ numpy==1.13.3 matplotlib==2.0.2 pyqtgraph==0.10.0 PyVISA==1.8 -PyQt5==5.9.1 -sip==4.19.5 +PyQt5==5.9 +sip==4.19.3 QtPy==1.3.1 h5py==2.7.1 jsonschema