Skip to content

Commit

Permalink
Merge pull request #205 from pkgw/fix-readthedocs
Browse files Browse the repository at this point in the history
Fix ReadTheDocs build for PyQt5 >= 5.12
  • Loading branch information
pkgw committed May 8, 2019
2 parents df5bcbf + 39613d8 commit 9e45670
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 4 deletions.
9 changes: 6 additions & 3 deletions docs/installation.rst
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,9 @@ You can also install the latest release of pywwt using `pip

pip install pywwt

If you want to use the Qt widget, you will need to install
`PyQt <https://riverbankcomputing.com/software/pyqt/intro>`_ or
If you want to use the Qt widget, you will need to install `PyQt
<https://riverbankcomputing.com/software/pyqt/intro>`_ and `PyQtWebEngine
<https://riverbankcomputing.com/software/pyqtwebengine/intro>`_, or
`PySide <https://wiki.qt.io/PySide>`_ separately.

If you want to use WWT inside Jupyter Lab, see `Using Jupyter Lab`_.
Expand Down Expand Up @@ -73,7 +74,9 @@ if using pip). For the record, these dependencies are as follows:
In addition, if you want to use the Qt widget, you will need:

* `PySide <https://wiki.qt.io/PySide>`__ or `PyQt
<https://riverbankcomputing.com/software/pyqt/intro>`__ (both PyQt4 and PyQt5 are supported)
<https://riverbankcomputing.com/software/pyqt/intro>`__ and `PyQtWebEngine
<https://riverbankcomputing.com/software/pyqtwebengine/intro>`__ (both PyQt4
and PyQt5 are supported)
* `QtPy <https://pypi.org/project/QtPy/>`__ 1.2 or later

For the Jupyter widget, you will need:
Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,8 @@
'jupyter_sphinx',
],
'qt': [
'PyQt5'
'PyQt5',
'PyQtWebEngine',
]
},
entry_points = {
Expand Down

0 comments on commit 9e45670

Please sign in to comment.