Merge pull request #454 from brechmos-stsci/v0.2.1-setup-fix

V0.2.1 setup fix

.travis.yml

@@ -37,7 +37,7 @@ env:
 
         # List other runtime dependencies for the package that are available as
         # conda packages here.
-        - CONDA_DEPENDENCIES='pyqt matplotlib scipy glue-core>=0.12 asdf specviz=0.5'
+        - CONDA_DEPENDENCIES='pyqt matplotlib scipy glue-core>=0.13 asdf specviz=0.5 specutils=0.2.2'
         - CONDA_VERSION=4.3.31
 
         # List other runtime dependencies for the package that are available as
@@ -57,7 +57,6 @@ env:
 
     matrix:
         # Make sure that egg_info works without dependencies
-        - PYTHON_VERSION=3.5 MAIN_CMD='python setup.py' SETUP_CMD='egg_info'
         - PYTHON_VERSION=3.6 MAIN_CMD='python setup.py' SETUP_CMD='egg_info'
 
 matrix:
@@ -73,9 +72,9 @@ matrix:
         # os: linux
         #  env: SETUP_CMD='--coverage'
 
-        # Test against Python 3.5
-        - os: linux
-          env: PYTHON_VERSION=3.5
+        # Test against Python 3.7
+        #- os: linux
+        #  env: PYTHON_VERSION=3.7
 
         # Check for sphinx doc build warnings - we do this first because it
         # may run for a long time

appveyor.yml

@@ -12,7 +12,7 @@ environment:
                         # to the matrix section.
 
       NUMPY_VERSION: "stable"
-      CONDA_DEPENDENCIES: "pyqt matplotlib scipy glue-core>=0.12 asdf specviz=0.5"
+      CONDA_DEPENDENCIES: "pyqt scipy glue-core>=0.13 asdf specviz==0.5 specutils=0.2.2"
       PIP_DEPENDENCIES: "pytest-qt"
 
       # Conda packages for affiliated packages are hosted in channel
@@ -21,13 +21,9 @@ environment:
       # add the channels to CONDA_CHANNELS along with any other channels
       # you want to use.
       CONDA_CHANNELS: "glueviz/label/dev glueviz astropy-ci-extras astropy"
-      CONDA_VERSION: "4.3.31"
 
   matrix:
 
-      - PYTHON_VERSION: "3.5"
-        ASTROPY_VERSION: "stable"
-
       - PYTHON_VERSION: "3.6"
         ASTROPY_VERSION: "stable"
 

cubeviz/__init__.py

@@ -4,19 +4,19 @@
 This is an Astropy affiliated package.
 """
 
-import astropy.units as units
-from .flux_equivalences import CustomFluxEquivalences
-# We override the units.equivalencies.spectral_density function with
-# CustomFluxEquivalences before the program starts. We expect all libraries
-# to access CustomFluxEquivalences when calling for units.equivalencies.spectral_density
-units.equivalencies.spectral_density = CustomFluxEquivalences(units.equivalencies.spectral_density)
-units.spectral_density = units.equivalencies.spectral_density
-
 # Affiliated packages may add whatever they like to this file, but
 # should keep this content at the top.
 # ----------------------------------------------------------------------------
 from ._internal_init import *
 # ----------------------------------------------------------------------------
 
 if _CUBEVIZ_SETUP_ is False:
+    import astropy.units as units
+    from .flux_equivalences import CustomFluxEquivalences
+    # We override the units.equivalencies.spectral_density function with
+    # CustomFluxEquivalences before the program starts. We expect all libraries
+    # to access CustomFluxEquivalences when calling for units.equivalencies.spectral_density
+    units.equivalencies.spectral_density = CustomFluxEquivalences(units.equivalencies.spectral_density)
+    units.spectral_density = units.equivalencies.spectral_density
+
     from . import keyboard_shortcuts

cubeviz/cubeviz.py

@@ -5,7 +5,7 @@
 import os
 
 from glue.app.qt import GlueApplication
-from glue.main import restore_session, get_splash, load_data_files, load_plugins
+from glue.main import get_splash, load_data_files, load_plugins
 from qtpy.QtCore import QTimer
 from qtpy import QtGui, QtWidgets
 

setup.cfg

@@ -13,7 +13,7 @@ upload-dir = docs/_build/html
 show-response = 1
 
 [tool:pytest]
-minversion = 3.1
+minversion = 0.2.1
 testpaths = "cubeviz" "docs"
 norecursedirs = docs/_build
 doctest_plus = enabled
@@ -49,7 +49,7 @@ edit_on_github = True
 github_project = spacetelescope/cubeviz
 # version should be PEP386 compatible (http://www.python.org/dev/peps/pep-0386)
 version = 0.2.1
-install_requires = numpy>=1.13 matplotlib astropy asdf pytest>=3.1 glue-core>=0.12
+install_requires = numpy>=1.13 matplotlib astropy asdf pytest>=3.1 glue-core>=0.13 specviz==0.5
 
 [entry_points]
 

setup.py

@@ -9,10 +9,7 @@
 from setuptools import setup
 
 # A dirty hack to get around some early import/configurations ambiguities
-if sys.version_info[0] >= 3:
-    import builtins
-else:
-    import __builtin__ as builtins
+import builtins
 builtins._CUBEVIZ_SETUP_ = True
 
 from astropy_helpers.setup_helpers import (register_commands, get_debug_option,