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

PR: Migrate to qtpy #3098

Merged
merged 86 commits into from
Apr 10, 2016
Merged

PR: Migrate to qtpy #3098

merged 86 commits into from
Apr 10, 2016

Conversation

goanpeca
Copy link
Member

@goanpeca goanpeca commented Apr 9, 2016

Fixes #3101

@ccordoba12 ccordoba12 added this to the v3.0beta4 milestone Apr 9, 2016
@ccordoba12
Copy link
Member

Thanks a lot for doing this @goanpeca! I don't know why but tests are failing intermittently...

@goanpeca
Copy link
Member Author

goanpeca commented Apr 9, 2016

Hmmmm ok, I will keep moving and see how it goes.

goanpeca added 23 commits April 9, 2016 15:44
@goanpeca
Migrate colors.py to qtpy
effa0e6
@goanpeca
Migrate comboboxes.py to qtpy
39ad973
@goanpeca
Change QtWebKit to QtWebEngineWidgets
ff164b3
@goanpeca
Migrate dependencies.py to qtpy
3242601
@goanpeca
Migrate editor.py to qtpy
0dc9090
@goanpeca
Migrate editortools.py to qtpy
66746d7
@goanpeca
Migrate explorer.py to qtpy
7273578
@goanpeca
Migrate fileswitcher.py to qtpy
6209da2
@goanpeca
Migrate findinfiles.py to qtpy
3c8d13a
@goanpeca
Migrate findreplace.py to qtpy
af3e150
@goanpeca
Migrate formlayout.py to qtpy
f21b6ef
@goanpeca
Migrate helperwidgets.py to qtpy
c659d67
@goanpeca
Migrate internalshell.py to qtpy
7b1f1f4
@goanpeca
Migrate ipython.py to qtpy
2b5b809
@goanpeca
Migrate mixins.py to qtpy
912ffb3
@goanpeca
Migrate onecolumntree.py to qtpy
6b4af40
@goanpeca
Migrate pathmanager.py to qtpy
3414fbd
@goanpeca
Migrate projectexplorer.py to qtpy
7a51ceb
@goanpeca
Migrate pydocgui.py to qtpy
7e88bf7
@goanpeca
Remove project file
992bd79
@goanpeca
Migrate shell.py to qtpy
9457a80
@goanpeca
Migrate status.py to qtpy
f5c67da
@goanpeca
Migrate tabs.py to qtpy
8788f18
@goanpeca
Copy link
Member Author

I tested removing the spyderlib/qt to see if everything started. It seems to be working fine.
Should we remove spyderlib/qt as part of this PR, or in a separate PR @ccordoba12?

@goanpeca goanpeca changed the title [WIP] PR: Migrate to qtpy PR: Migrate to qtpy Apr 10, 2016
goanpeca
goanpeca reviewed Apr 10, 2016
View reviewed changes
spyderlib/widgets/sourcecode/codeeditor.py
from qtpy import is_pyqt46
from qtpy.compat import to_qvariant
from qtpy.QtCore import QRect, QRegExp, QSize, Qt, QTimer, Signal, Slot
from qtpy.QtGui import (QBrush, QColor, QCursor, QFont, #QIntValidator, # FIXME: QTPY needs to be fixed!
Copy link
Member Author

Choose a reason for hiding this comment

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

@ccordoba12 please add QIntValidator to the imports (Uncomment) after new QtPy is available.

@ccordoba12 ccordoba12 mentioned this pull request Apr 10, 2016
Closed
@ccordoba12 ccordoba12 modified the milestones: v3.0beta3, v3.0beta4 Apr 10, 2016
@ccordoba12
Copy link
Member

@goanpeca, I just released a new qtpy (1.0.1) with the QIntValidator change. Please do the changes you mentioned yourself, so we don't have to merge a non-passing PR :-)

Thanks!

Note: I decided to add this to beta3 because this is ready and also to give our testers the chance to see if there are problems after this change.

@goanpeca
Copy link
Member Author

@ccordoba12 👍

@ccordoba12 ccordoba12 merged commit d07c06d into spyder-ide:master Apr 10, 2016
@goanpeca goanpeca mentioned this pull request Apr 12, 2016
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@ccordoba12 ccordoba12

Labels
type:Techdebt
Projects
None yet
Milestone
v3.0beta3
Development

Successfully merging this pull request may close these issues.
4 participants
@goanpeca @ccordoba12 @jitseniesen @Macer3