Update docs; remove PyQt5 dependency that breaks travis

spacetelescope · Apr 5, 2017 · 4610e5f · 4610e5f
1 parent c39e52c
commit 4610e5f
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 6 deletions.
diff --git a/docs/source/installation.rst b/docs/source/installation.rst
@@ -80,6 +80,24 @@ You can specify by using ``pip2`` or ``pip3``, if you're not using a virtual
 environment.
 
 
+PyQt/PySide bindings
+^^^^^^^^^^^^^^^^^^^^
+
+SpecViz requires PyQt. Currently, only python environments with 3.5 or higher
+installed can use ``pip`` to install PyQt5, in which case simply type::
+
+    $ pip install pyqt5
+
+to install it on your system.
+
+In any other case, PyQt can be installed via anaconda::
+
+    $ conda install pyqt
+
+SpecViz works with with PyQt4 and PySide, but it is recommended that users use
+PyQt5 if available.
+
+
 Uninstalling
 ^^^^^^^^^^^^
 

diff --git a/requirements.txt b/requirements.txt
@@ -8,5 +8,4 @@ sphinx_automodapi
 sphinx_rtd_theme
 specutils
 pyqtgraph
-pyqt5; python_version >= '3.5'
 qtpy
diff --git a/setup.py b/setup.py
@@ -133,11 +133,11 @@
           'scipy',
           'qtpy'
       ],
-      extras_require={
-          ':python_version >= "3.5"': [
-              'pyqt5',
-          ],
-      },
+      # extras_require={
+      #     ':python_version >= "3.5"': [
+      #         'pyqt5',
+      #     ],
+      # },
       author=AUTHOR,
       author_email=AUTHOR_EMAIL,
       license=LICENSE,