From 4519c976bc8f3999506a2b1d73c8d5707ffcec2c Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Wed, 30 Aug 2017 17:49:49 +0200 Subject: [PATCH 1/9] drop dependency on jupyupyter --- setup.py | 3 --- 1 file changed, 3 deletions(-) diff --git a/setup.py b/setup.py index 4bc1c18289b..edffcaf9948 100644 --- a/setup.py +++ b/setup.py @@ -58,9 +58,6 @@ def readme(): install_requires= [ 'numpy>=1.10', 'pyvisa>=1.8', - 'ipython>=4.1.0', - 'ipykernel!=4.6.0', # https://github.com/ipython/ipykernel/issues/240 in 4.6 - 'jupyter>=1.0.0', 'h5py>=2.6' ], From d9c1701ef82a478c26dec455dd3c39c7af40d970 Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Wed, 30 Aug 2017 17:50:28 +0200 Subject: [PATCH 2/9] Add support for 3.6 to classifier --- setup.py | 1 + 1 file changed, 1 insertion(+) diff --git a/setup.py b/setup.py index edffcaf9948..a2c0ccc9d0e 100644 --- a/setup.py +++ b/setup.py @@ -48,6 +48,7 @@ def readme(): 'Intended Audience :: Science/Research', 'Programming Language :: Python :: 3 :: Only', 'Programming Language :: Python :: 3.5', + 'Programming Language :: Python :: 3.6', 'Topic :: Scientific/Engineering' ], license='MIT', From 5cc622bf73091c28b478032f447667689a6f3945 Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Wed, 30 Aug 2017 17:50:55 +0200 Subject: [PATCH 3/9] make me the maintainer --- setup.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index a2c0ccc9d0e..2aafa475040 100644 --- a/setup.py +++ b/setup.py @@ -36,8 +36,8 @@ def readme(): version=get_version(), use_2to3=False, - maintainer='Giulio Ungaretti', - maintainer_email='unga@nbi.ku.dk', + maintainer='Jens H Nielsen', + maintainer_email='j.h.nielsen@nbi.ku.dk', description='Python-based data acquisition framework developed by the ' 'Copenhagen / Delft / Sydney / Microsoft quantum computing ' 'consortium', From db030ee3d7808273e357481a9a4141bb9b602b8e Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Thu, 31 Aug 2017 10:16:29 +0200 Subject: [PATCH 4/9] remove jupyter from requirements --- requirements.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 52bffd4da99..3ddf556c0f7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,3 @@ -jupyter==1.0.0 numpy==1.12.1 matplotlib==2.0.2 pyqtgraph==0.10.0 From 21333dd5ea28c611aa52e4084346eb7df77c4168 Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Thu, 31 Aug 2017 10:17:18 +0200 Subject: [PATCH 5/9] update numpy version --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 3ddf556c0f7..8decb935057 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -numpy==1.12.1 +numpy==1.13.1 matplotlib==2.0.2 pyqtgraph==0.10.0 PyVISA==1.8 From b5361c0491e10e07439364204e0253616ce4391c Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Thu, 31 Aug 2017 10:19:21 +0200 Subject: [PATCH 6/9] bump qt versions --- requirements.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements.txt b/requirements.txt index 8decb935057..6e276416280 100644 --- a/requirements.txt +++ b/requirements.txt @@ -2,7 +2,7 @@ numpy==1.13.1 matplotlib==2.0.2 pyqtgraph==0.10.0 PyVISA==1.8 -PyQt5==5.7.1 -sip==4.19 -QtPy==1.2.0 +PyQt5==5.9 +sip==4.19.3 +QtPy==1.3.1 h5py==2.7.0 From bc9a4dfec9053ac7926ca90e9e1d2f4cf42ad49d Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Thu, 31 Aug 2017 10:48:15 +0200 Subject: [PATCH 7/9] But nbconvert is needed for docs build --- docs_requirements.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/docs_requirements.txt b/docs_requirements.txt index 544d45e5b02..eb5ee45278f 100644 --- a/docs_requirements.txt +++ b/docs_requirements.txt @@ -1,4 +1,5 @@ sphinx sphinx_rtd_theme jsonschema -sphinxcontrib-jsonschema \ No newline at end of file +sphinxcontrib-jsonschema +nbconvert From 51c76d20dbea1711c0e9851f426e1d6a70db03ff Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Thu, 31 Aug 2017 10:54:48 +0200 Subject: [PATCH 8/9] also need ipython for nbconver --- docs_requirements.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/docs_requirements.txt b/docs_requirements.txt index eb5ee45278f..a8abb189efe 100644 --- a/docs_requirements.txt +++ b/docs_requirements.txt @@ -3,3 +3,4 @@ sphinx_rtd_theme jsonschema sphinxcontrib-jsonschema nbconvert +ipython From 83bddae1a59b95afc4c35934479eb6f681d0a9bf Mon Sep 17 00:00:00 2001 From: Jens Hedegaard Nielsen Date: Mon, 4 Sep 2017 22:09:13 +0200 Subject: [PATCH 9/9] upgrade h5py fixes an seqfault --- environment.yml | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/environment.yml b/environment.yml index 21e52feaf86..da7c3d72470 100644 --- a/environment.yml +++ b/environment.yml @@ -9,7 +9,7 @@ dependencies: - python=3.6 - jsonschema - pyvisa - - QtPy=1.2.0 + - QtPy - sip - pyqt=5.6.0 - numpy diff --git a/requirements.txt b/requirements.txt index 6e276416280..32d5add6fb3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -5,4 +5,4 @@ PyVISA==1.8 PyQt5==5.9 sip==4.19.3 QtPy==1.3.1 -h5py==2.7.0 +h5py==2.7.1