Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Cleanup dependencies #721

Merged
merged 10 commits into from
Sep 5, 2017
Merged

Cleanup dependencies #721

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
4519c97
drop dependency on jupyupyter
jenshnielsen Aug 30, 2017
d9c1701
Add support for 3.6 to classifier
jenshnielsen Aug 30, 2017
5cc622b
make me the maintainer
jenshnielsen Aug 30, 2017
db030ee
remove jupyter from requirements
jenshnielsen Aug 31, 2017
21333dd
update numpy version
jenshnielsen Aug 31, 2017
b5361c0
bump qt versions
jenshnielsen Aug 31, 2017
bc9a4df
But nbconvert is needed for docs build
jenshnielsen Aug 31, 2017
51c76d2
also need ipython for nbconver
jenshnielsen Aug 31, 2017
5406307
Merge branch 'master' into cleanup_deps
jenshnielsen Sep 4, 2017
83bddae
upgrade h5py fixes an seqfault
jenshnielsen Sep 4, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion docs_requirements.txt
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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