Skip to content

Complete qtconsole PyQt5 port - #7129

Merged
takluyver merged 4 commits into
ipython:masterfrom
ccordoba12:pyqt5
Dec 15, 2014
Merged

takluyver merged 4 commits into
ipython:masterfrom
ccordoba12:pyqt5

Conversation

@ccordoba12

Copy link
Copy Markdown
Member

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 qtconsole

If QT_API is 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

@ccordoba12

Copy link
Copy Markdown
Member Author

The problem with opening new tabs was introduced in PR #7094, so pinging @helenst about it. The thing is new widgets don't have the _display_banner attr introduced by @helenst (in the reset method of FrontendWidget) so they fail to be created.

@helenst

helenst commented Dec 7, 2014

Copy link
Copy Markdown

apologies for breaking this... I'm testing a fix.

@Carreau

Carreau commented Dec 8, 2014

Copy link
Copy Markdown
Member

@ccordoba12 fix for tabs seem to have been merged, and patch looks harmless. Tell us when you think we can merge that.

@takluyver

Copy link
Copy Markdown
Member

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.

@ccordoba12

Copy link
Copy Markdown
Member Author

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 :-)

@takluyver

Copy link
Copy Markdown
Member

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.

@takluyver

Copy link
Copy Markdown
Member

@ccordoba12 we did merge #7108 (thanks for the review). Is there still anything from this that we need to do?

@ccordoba12

Copy link
Copy Markdown
Member Author

I'll rebase it and test again.

This was discovered when checking the code with PyQt5
This is needed for PyQt5 compatibility
Comment thread IPython/qt/console/ipython_widget.py Outdated

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

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

@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)

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

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).

@ccordoba12

Copy link
Copy Markdown
Member Author

@takluyver things are working on my side again :-)

@rgbkrk

rgbkrk commented Dec 14, 2014

Copy link
Copy Markdown
Member

Re kicked Travis since it was complaining about the widget warning (which has been addressed in master now).

@ccordoba12

Copy link
Copy Markdown
Member Author

Thanks @rgbkrk but Travis still shows a failure. Should I rebase again?

@takluyver

Copy link
Copy Markdown
Member

Travis was showing an error on one particular test group. I've prodded that to restart.

@takluyver

Copy link
Copy Markdown
Member

And now Travis is happy again. Thanks @ccordoba12 , merging.

takluyver added a commit that referenced this pull request Dec 15, 2014
Complete qtconsole PyQt5 port
@takluyver
takluyver merged commit bd69cc1 into ipython:master Dec 15, 2014
@minrk minrk modified the milestone: 3.0 Jan 29, 2015
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.

PyQt5 qtconsole gives TypeError: __init__() takes exactly 4 arguments (1 given)

7 participants