Repository navigation
Complete qtconsole PyQt5 port - #7129
Conversation
|
apologies for breaking this... I'm testing a fix. |
|
@ccordoba12 fix for tabs seem to have been merged, and patch looks harmless. Tell us when you think we can merge that. |
|
This will certainly conflict with #7108. If we're going to merge that, I'd recommend we check what that needs to work with PyQt5, and close this one. |
|
I don't have a problem with closing this one @takluyver. There are two commits here: one adding default values to channel constructors and the other removing a wrong overloading of a signal. The first fits well with #7108 but not the second, so it's your call :-) |
|
Actually, I mostly meant that the first will cause a git conflict. I'm sure I can resolve that if I need to, but it will probably be a pain, so if we're going to merge that soon, I'd rather you make the necessary changes on top of that PR. It's not clear if we are going to merge #7108 soon, though. I'll put it on the agenda for Thursday's dev meeting. |
|
@ccordoba12 we did merge #7108 (thanks for the review). Is there still anything from this that we need to do? |
|
I'll rebase it and test again. |
This was discovered when checking the code with PyQt5
This is needed for PyQt5 compatibility
There was a problem hiding this comment.
@takluyver Are these two lines right according to the latest kernel spec? I added them to make %guiref work again (something not related to PyQt5 but that I found while testing things)
There was a problem hiding this comment.
I think they'll work, but it's probably better to check content.get('implementation') == 'ipython', because there may be other Python kernels (e.g. simple_kernel).
|
@takluyver things are working on my side again :-) |
|
Re kicked Travis since it was complaining about the widget warning (which has been addressed in master now). |
|
Thanks @rgbkrk but Travis still shows a failure. Should I rebase again? |
|
Travis was showing an error on one particular test group. I've prodded that to restart. |
|
And now Travis is happy again. Thanks @ccordoba12 , merging. |
Complete qtconsole PyQt5 port
This completes the work of PR #5458 to make qtconsole work with PyQt5. To test it you need to cd into your fork, checkout this branch and run:
QT_API=pyqt5 python3 -m IPython qtconsoleIf
QT_APIis not set explicitly, IPython chooses Qt4 first.There is still an error when opening new tabs, so please don't merge it yet. I'm investigating how to fix it.Closes #6103