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.

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

Fixes for qtpy 1.1.0 #3233

Merged
merged 7 commits into from
Jun 30, 2016
Merged

Fixes for qtpy 1.1.0 #3233

merged 7 commits into from
Jun 30, 2016

Conversation

ccordoba12
Copy link
Member

Fixes #3230


We were incorrectly setting qtpy.__version__ to the PyQt version instead of the package one, which breaks the tradition of using __version__ as the package version.

qtpy 1.1.0 is going to fix this and we need to adapt to this change in Spyder 3.0 :-)


Note: Our tests are going to be broken in this PR until we release qtpy 1.1.0

@ccordoba12 ccordoba12 added this to the v3.0beta4 milestone Jun 18, 2016
@@ -39,7 +39,7 @@ def check_qt():
try:
import qtpy
package_name, required_ver = qt_infos[qtpy.API]
actual_ver = qtpy.__version__
actual_ver = qtpy.PYQT_VERSION
Copy link
Contributor

Choose a reason for hiding this comment

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

I know we don't support pyside officially anymore, but if I'm not mistaken this will break pyside, since qtpy.PYQT_VERSION is None with pyside. I think using qtpy.QT_VERSION instead should do the trick.

Copy link
Member Author

Choose a reason for hiding this comment

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

We are not allowing PySide in qt_infos so it's really unsupported at this time. But that's for another PR :-)

Copy link
Contributor

Choose a reason for hiding this comment

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

What is for another PR, PySide support in qt_infos ? Why not adding it directly here ?

Copy link
Member Author

Choose a reason for hiding this comment

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

Because this one is only about supporting the newest qtpy. Please prepare it and I'll merge it :-)

@goanpeca
Copy link
Member

image

And this is not even including quantified code!! haha

@ccordoba12
Copy link
Member Author

Sorry, I messed things up by pushing my personal branch as a repo one. I hope this gets fixed once I push a new commit.

@ccordoba12 ccordoba12 closed this Jun 30, 2016
@ccordoba12 ccordoba12 reopened this Jun 30, 2016
@ccordoba12 ccordoba12 merged commit a9e2336 into spyder-ide:master Jun 30, 2016
@ccordoba12 ccordoba12 deleted the fix-qtpy branch June 30, 2016 23:28
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Spyder is failing because of wrong qtpy version
3 participants