Skip to content

Conversation

@montefra
Copy link
Contributor

@montefra montefra commented Aug 5, 2016

I have a tentative update of the documentation according to what we have discussed in #148.

I'm not very satisfied by it. I might change some of it in the next days. Comments are welcome

@coveralls
Copy link

coveralls commented Aug 5, 2016

Coverage Status

Coverage remained the same at 100.0% when pulling c25e7c0 on montefra:fix_pyqt4v2 into e5f4467 on pytest-dev:master.

docs/intro.rst Outdated
if both are set).

.. _version2: http://pyqt.sourceforge.net/Docs/PyQt4/incompatible_apis.html
Starting with ``pytest-qt`` version 2.0, ``PyQt`` or ``PySide`` are loaded after
Copy link
Member

@nicoddemus nicoddemus Aug 5, 2016

Choose a reason for hiding this comment

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

Probably this is too much information to be into the "introduction" part of the docs. Perhaps we can add an entry "A note about pyqt4v2", similar to A note about QApplication.exit() and add a link here?

@nicoddemus
Copy link
Member

Thanks for the follow up @montefra!

@montefra
Copy link
Contributor Author

montefra commented Aug 9, 2016

@nicoddemus I've updated the info according to your suggestions.


on a slightly related note: would you mind if I add extras_require={'doc': ['sphinx', 'sphinx_rtd_theme']}, in the setup call and update the Development information to use pip install -e . or pip install -e .[doc] , instead of python setup.py develop?
I found myself using a couple of different venvs and having to run make html, pip install sphinx, make html and then pip install sphinx_rtd_theme to be able to build the documentation locally.

@coveralls
Copy link

coveralls commented Aug 9, 2016

Coverage Status

Coverage remained the same at 100.0% when pulling d2a461b on montefra:fix_pyqt4v2 into e5f4467 on pytest-dev:master.

@nicoddemus
Copy link
Member

on a slightly related note: would you mind if I add extras_require={'doc': ['sphinx', 'sphinx_rtd_theme']}, in the setup call and update the Development information to use pip install -e . or pip install -e .[doc] , instead of python setup.py develop?

Not at all, seems like a much better approach than the current one. 😁

@montefra
Copy link
Contributor Author

montefra commented Aug 9, 2016

can I do it here or would you prefer a new branch?

@nicoddemus
Copy link
Member

Feel free to do it here, just make sure to use a separate commit. 👍

@coveralls
Copy link

coveralls commented Aug 9, 2016

Coverage Status

Coverage decreased (-2.0%) to 98.049% when pulling 23f6bc3 on montefra:fix_pyqt4v2 into e5f4467 on pytest-dev:master.

@coveralls
Copy link

coveralls commented Aug 9, 2016

Coverage Status

Coverage remained the same at 100.0% when pulling 23f6bc3 on montefra:fix_pyqt4v2 into e5f4467 on pytest-dev:master.

@nicoddemus
Copy link
Member

Excellent, many thanks @montefra!

@nicoddemus nicoddemus merged commit 598c1c2 into pytest-dev:master Aug 9, 2016
@montefra
Copy link
Contributor Author

montefra commented Aug 9, 2016

Glad to contribute back to a tool I use regularly.
Thank you for accepting the PR.

@montefra montefra deleted the fix_pyqt4v2 branch August 9, 2016 20:23
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.

3 participants