Skip to content

Commit

Permalink
Cleanup dependencies (#721)
Browse files Browse the repository at this point in the history
* drop dependency on jupyupyter

* Add support for 3.6 to classifier

* make me the maintainer

* remove jupyter from requirements

* update numpy version

* bump qt versions

* But nbconvert is needed for docs build

* also need ipython for nbconver

* upgrade h5py fixes an seqfault
  • Loading branch information
jenshnielsen authored and WilliamHPNielsen committed Sep 5, 2017
1 parent 5acbeeb commit 2b097e1
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 13 deletions.
4 changes: 3 additions & 1 deletion docs_requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
sphinx
sphinx_rtd_theme
jsonschema
sphinxcontrib-jsonschema
sphinxcontrib-jsonschema
nbconvert
ipython
2 changes: 1 addition & 1 deletion environment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ dependencies:
- python=3.6
- jsonschema
- pyvisa
- QtPy=1.2.0
- QtPy
- sip
- pyqt=5.6.0
- numpy
Expand Down
11 changes: 5 additions & 6 deletions requirements.txt
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
jupyter==1.0.0
numpy==1.12.1
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
h5py==2.7.0
PyQt5==5.9
sip==4.19.3
QtPy==1.3.1
h5py==2.7.1
8 changes: 3 additions & 5 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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',
Expand All @@ -58,9 +59,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'
],

Expand Down

0 comments on commit 2b097e1

Please sign in to comment.