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

Remove references to PyQt4 because it's going to be deprecated in Spyder 3.3 #42

Closed
wants to merge 1 commit into from

Conversation

ccordoba12
Copy link
Member

Pull Request Checklist

  • Read and followed this repo's Contributing Guidelines
  • Based your PR on the latest version of the correct branch (master or 3.x)
  • Checked your writing carefully for correct English spelling, grammar, etc
  • Described your changes and the motivation for them below
  • Noted what issue(s) this pull request resolves, creating one if needed

Description of Changes

Accompanying PR for spyder-ide/spyder#6991.

@ccordoba12 ccordoba12 added this to the Initial Public Release milestone May 21, 2018
@ccordoba12 ccordoba12 requested a review from CAM-Gerlach May 21, 2018 21:03
Copy link
Member

@CAM-Gerlach CAM-Gerlach left a comment

Choose a reason for hiding this comment

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

Looks like all these changes are already included in my baseline pass PR for #13 (forthcoming in a few hours; just doing a final style conformance pass and link check), either as part of the "updating outdated portions of the docs" portion of the scope (and I actually ended up using the exact same wording as you did for both) or were otherwise superseded with other already up to date text during the copyedit and thus are no longer needed. Sorry for the duplicate effort and the bad timing (a few hours later, and my finished PR would have already been public with these changes included), and let me know what you think over there if I need to clarify anything else. Thanks!

@@ -171,8 +169,8 @@ The requirements to run Spyder are:
* `PyZMQ <https://github.com/zeromq/pyzmq>`_ -- To run introspection services on the
Editor asynchronously.

* `QtPy <https://github.com/spyder-ide/qtpy>`_ >=1.2.0 -- To run Spyder with PyQt4 or
PyQt5 seamlessly.
* `QtPy <https://github.com/spyder-ide/qtpy>`_ >=1.2.0 -- To run Spyder with different
Copy link
Member

Choose a reason for hiding this comment

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

Already re-wrote this line for clarity/generality, and actually used the exact same wording you did.

* `PyQt5 <https://www.riverbankcomputing.com/software/pyqt/download5>`_ >=5.2 or
`PyQt4 <https://www.riverbankcomputing.com/software/pyqt/download>`_ >=4.6.0
(PyQt5 is recommended).
* `PyQt5 <https://www.riverbankcomputing.com/software/pyqt/download5>`_ >=5.5
Copy link
Member

Choose a reason for hiding this comment

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

Already done on my #13 PR exactly as it is here, given it was within the scope of "updating outdated references" and it also changes the link format to conform to the baseline style guide.

Spyder may also be used as a PyQt5 or PyQt4 extension library
(module 'spyder'). For example, the Python interactive shell widget
used in Spyder may be embedded in your own PyQt5 or PyQt4 application.
Spyder may also be used as a PyQt5 extension library (module
Copy link
Member

Choose a reason for hiding this comment

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

This block was superseded in the revised version with the relevant block from the current Spyder readme, which only mentions PyQt5.

@@ -215,8 +213,7 @@ Before installing Spyder itself by this method, you need to acquire the
`Python programming language <http://www.python.org/>`_

Then, to install Spyder and its other dependencies, run ``pip install spyder``.
You may need to separately install a Qt binding with ``pip`` if running Python 2;
PyQt5 is strongly recommended though the legacy PyQt4 is also still supported.
You may need to separately install PyQt5 with ``pip`` if running Python 2.
Copy link
Member

Choose a reason for hiding this comment

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

Already changed to remove the legacy PyQt4 mention, within the scope of "updating outdated statements"

@CAM-Gerlach
Copy link
Member

Hey, so all of this is already implemented in my baseline-pass branch to fix #13 , as noted in the review comment. Sorry for the duplicated effort! You can create a separate issue to track it if you want which my #13 PR can close.

@ccordoba12
Copy link
Member Author

ccordoba12 commented May 21, 2018

Hey, so all of this is already implemented in my baseline-pass branch to fix #13

I thought you were going to implement it, not that you already did! No problem then, I'll close this one and open an issue to be referenced in #13.

@ccordoba12 ccordoba12 closed this May 21, 2018
@CAM-Gerlach
Copy link
Member

Sorry about that—that's what I get for sitting on a big, monolithic, conflict-happy PR for too long. However, a lot of the reason it is monolithic and would cause lot of conflicts if I broke it up is due to implementing a consistent style guide across all files to make editing and reviewing much easier, more modular and less likely to cause conflicts in the future (particularly, breaking lines by sentence instead of hard-wrapping at a fixed character count, to prevent small changes from cascading to multiple lines) and prevent us from ever needing to do such a large, multi-file PR again after this public release; everything can be in nice, small, single-file PRs that can get reviewed and merged quickly and coexist in peace :)

@ccordoba12
Copy link
Member Author

No worries, but we need your fixes soon (a week and a half, two weeks at most), so we can have our new docs ready for 3.3 :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants