Fixes following 0.15.0 release

CHANGES.md

@@ -6,6 +6,16 @@ v0.16.0 (unreleased)
 
 * No changes yet.
 
+v0.15.1 (unreleased)
+--------------------
+
+* Fixed __version__ variable. [#2031]
+
+* Fixed tox configuration. [#2031]
+
+* Improve error message if loading a session file that uses WCS auto-linking
+  but the installed version of astropy is too old. [#2031]
+
 v0.15.0 (2019-06-23)
 --------------------
 

doc/whatsnew/whatsnew.rst

@@ -88,9 +88,10 @@ New auto-linking functionality
 
 We have now set up an infrastructure to make it possible to define plugins that
 can automatically suggest links, and have included such a plugin for linking
-astronomical images and higher dimensional datasets. To write such a plugin, you
-will need to define a Python function that takes a data collection and then
-returns a list of links, e.g.::
+astronomical images and higher dimensional datasets (note that this
+functionality requires astropy 3.1 or later). To write such a plugin, you will
+need to define a Python function that takes a data collection and then returns a
+list of links, e.g.::
 
     from glue.config import autolinker
 

glue/__init__.py

@@ -5,6 +5,14 @@
 import os
 
 import sys
+
+from pkg_resources import get_distribution, DistributionNotFound
+
+try:
+    __version__ = get_distribution('glue-core').version
+except DistributionNotFound:
+    __version__ = 'undefined'
+
 from ._mpl_backend import MatplotlibBackendSetter
 sys.meta_path.append(MatplotlibBackendSetter())
 
@@ -16,8 +24,6 @@
 
 from .qglue import qglue
 
-from .version import __version__  # noqa
-
 from .main import load_plugins  # noqa
 
 

glue/conftest.py

@@ -22,6 +22,11 @@ def pytest_runtest_teardown(item, nextitem):
     sys.stderr = STDERR_ORIGINAL
 
 
+def pytest_addoption(parser):
+    parser.addoption("--no-optional-skip", action="store_true", default=False,
+                     help="don't skip any tests with optional dependencies")
+
+
 def pytest_configure(config):
 
     os.environ['GLUE_TESTING'] = 'True'

glue/plugins/wcs_autolinking/__init__.py

@@ -2,12 +2,14 @@
 
 from astropy import __version__
 
+# The autolinking functionality relies on the new WCS API present in
+# Astropy 3.1 and later.
+ASTROPY_GE_31 = LooseVersion(__version__) >= '3.1'
+
 
 def setup():
 
-    # The autolinking functionality relies on the new WCS API present in
-    # Astropy 3.1 and later.
-    if LooseVersion(__version__) < '3.1':
+    if not ASTROPY_GE_31:
         return
 
     from . import wcs_autolinking  # noqa

glue/plugins/wcs_autolinking/wcs_autolinking.py

@@ -1,3 +1,5 @@
+from glue.plugins.wcs_autolinking import ASTROPY_GE_31
+
 from glue.config import autolinker, link_helper
 from glue.core.link_helpers import MultiLink
 from glue.core.coordinates import WCSCoordinates
@@ -115,6 +117,9 @@ def __gluestate__(self, context):
 
     @classmethod
     def __setgluestate__(cls, rec, context):
+        if not ASTROPY_GE_31:
+            raise ValueError("Loading this session file requires Astropy 3.1 "
+                             "or later to be installed")
         self = cls(context.object(rec['data1']),
                    context.object(rec['data2']))
         return self

setup.cfg

@@ -99,6 +99,12 @@ test =
 
 [options.package_data]
 * = *.png, *.ui, *.glu, *.hdf5, *.fits, *.xlsx, *.txt, *.csv, *.svg, *.vot
+glue.core.data_factories.tests = data/*.jpg
+glue.external.pvextractor = LICENSE
+glue.viewers.histogram.qt.tests = data/*.glu
+glue.viewers.image.qt.tests = data/*.glu, baseline/*.png
+glue.viewers.profile.qt.tests = data/*.glu
+glue.viewers.scatter.qt.tests = data/*.glu
 
 [flake8]
 ignore = E501,E731,F841,E127,E741,E402,W504,W605

tox.ini

@@ -5,7 +5,8 @@ requires = pip >= 18.0
 
 [testenv]
 passenv = DISPLAY HOME
+changedir = {envtmpdir}
 extras =
     test: test,qt
 commands =
-    test: pytest glue --cov glue -v
+    test: pytest --pyargs glue --cov glue -v