Merge pull request #4 from astrofrog/fix-imports-in-qglue

Fix imports of parse_data and parse_links
glue-viz · Aug 17, 2023 · 4539a0e · 4539a0e
2 parents 83554b5 + 81ae62e
commit 4539a0e
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/doc/conf.py b/doc/conf.py
@@ -42,7 +42,7 @@
     'echo': ('https://echo.readthedocs.io/en/latest/', None),
     'pandas': ('https://pandas.pydata.org/pandas-docs/stable/', None),
     'PyQt5': ('https://www.riverbankcomputing.com/static/Docs/PyQt5/', None),
-    'glue': ('http://docs.glueviz.org/en/latest/', None),
+    'glue': ('http://glue-core.readthedocs.org/en/latest/', None),
 }
 
 # Add any paths that contain templates here, relative to this directory.
@@ -135,14 +135,22 @@
                   ('py:class', 'PyQt5.sip.voidptr'),
                   ('py:class', 'PYQT_SLOT')]
 
-nitpick_ignore_regex = [('py:class', r'PyQt5\.QtCore\.Q[A-Z][a-zA-Z]+'),
-                        ('py:class', r'PyQt5\.QtWidgets\.Q[A-Z][a-zA-Z]+'),
-                        ('py:class', r'PyQt6\.QtCore\.Q[A-Z][a-zA-Z]+'),
-                        ('py:class', r'PyQt6\.QtWidgets\.Q[A-Z][a-zA-Z]+'),
-                        ('py:class', r'Qt\.[A-Z][a-zA-Z]+'),
-                        ('py:class', r'QPalette\.[A-Z][a-zA-Z]+'),
-                        ('py:class', r'QWidget\.[A-Z][a-zA-Z]+'),
-                        ('py:class', r'Q[A-Z][a-zA-Z]+')]
+nitpick_ignore_regex = [('py:class', r'PyQt5\.QtCore\.Q[a-zA-Z]+'),
+                        ('py:class', r'PyQt5\.QtGui\.Q[a-zA-Z]+'),
+                        ('py:class', r'PyQt5\.QtWidgets\.Q[a-zA-Z]+'),
+                        ('py:class', r'PyQt6\.QtCore\.Q[a-zA-Z]+'),
+                        ('py:class', r'PyQt6\.QtGui\.Q[a-zA-Z]+'),
+                        ('py:class', r'PyQt6\.QtWidgets\.Q[a-zA-Z]+'),
+                        ('py:class', r'PySide2\.QtCore\.Q[a-zA-Z]+'),
+                        ('py:class', r'PySide2\.QtGui\.Q[a-zA-Z]+'),
+                        ('py:class', r'PySide2\.QtWidgets\.Q[a-zA-Z]+'),
+                        ('py:class', r'PySide6\.QtCore\.Q[a-zA-Z]+'),
+                        ('py:class', r'PySide6\.QtGui\.Q[a-zA-Z]+'),
+                        ('py:class', r'PySide6\.QtWidgets\.Q[a-zA-Z]+'),
+                        ('py:class', r'Qt\.[a-zA-Z]+'),
+                        ('py:class', r'QPalette\.[a-zA-Z]+'),
+                        ('py:class', r'QWidget\.[a-zA-Z]+'),
+                        ('py:class', r'Q[a-zA-Z]+')]
 
 # coax Sphinx into treating descriptors as attributes
 # see https://bitbucket.org/birkenfeld/sphinx/issue/1254/#comment-7587063

diff --git a/glue_qt/qglue.py b/glue_qt/qglue.py
@@ -9,13 +9,7 @@
 import sys
 from contextlib import contextmanager
 
-try:
-    from glue.core import BaseData, Data
-    from glue.core.cli_parsers import parse_data, parse_links
-except ImportError:
-    # let qglue import, even though this won't work
-    # qglue will throw an ImportError
-    BaseData = Data = None
+from glue.core.parsers import parse_data, parse_links
 
 
 __all__ = ['qglue']