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

Requirements cleanup #867

Merged
merged 4 commits into from
Nov 13, 2017
+4 −3
Merged

Requirements cleanup #867

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
15ff238
jsonschema is needed not only for docs build
jenshnielsen Nov 13, 2017
8b66267
Bump numpy and pyqt/sip to latest bug fix release
jenshnielsen Nov 13, 2017
b0274d8
Latest version of pyqt is not on linux yet
jenshnielsen Nov 13, 2017
8cb79fa
Merge branch 'master' into requirements_cleanup
jenshnielsen Nov 13, 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
1 change: 0 additions & 1 deletion docs_requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
sphinx
sphinx_rtd_theme
jsonschema
sphinxcontrib-jsonschema
nbconvert
ipython
3 changes: 2 additions & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
numpy==1.13.1
numpy==1.13.3
matplotlib==2.0.2
pyqtgraph==0.10.0
PyVISA==1.8
PyQt5==5.9
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Travis can't install this. Does that not mean that our CI will stop working?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I know its because that version is only out for win and OSx not linux. I have reverted this

sip==4.19.3
QtPy==1.3.1
h5py==2.7.1
jsonschema
3 changes: 2 additions & 1 deletion setup.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down