fix version control

stips/__init__.py

@@ -1,23 +1,29 @@
 from __future__ import absolute_import
 
+import os
+
 # make use of astropy affiliate framework to set __version__, __githash__, and
 # add the test() helper function
 
 from ._astropy_init import *
 
-__all__ = ['astro_image', 'errors', 'galaxy_module', 'instruments', 'observation_module', 'scene_module', 'stellar_module', 'utilities', 'version', 'test']
-# Don't modify the line above, or this line!
-import automodinit, os
-automodinit.automodinit(__name__, __file__, globals())
-del automodinit
+__all__ = ['astro_image', 'errors', 'galaxy_module', 'instruments',
+           'observation_module', 'scene_module', 'stellar_module',
+           'utilities', 'version', '__version__', 'test']
+
+try:
+    from .version import version as __version__
+except ImportError:
+    __version__ = 'dev'
+version = __version__
 
 # Local Definitions
 
 from .astro_image import AstroImage
 from .instruments import Instrument
 from .observation_module import ObservationModule
 from .scene_module import SceneModule
-from .version import __version__
+
 from .utilities import GetStipsData, internet, CachedJbtBackground, __grid__
 
 __grid__pandeia__version__ = __grid__.__pandeia__version__

stips/astro_image/__init__.py

@@ -1,7 +1,4 @@
 __all__ = ['astro_image']
-# Don't modify the line above, or this line!
-import automodinit
-automodinit.automodinit(__name__, __file__, globals())
-del automodinit
+
 # Local Definitions
 from .astro_image import AstroImage

stips/astro_image/astro_image.py

@@ -21,7 +21,7 @@
     from cStringIO import StringIO
 
 #Local Modules
-from stips.version import __version__ as stips_version
+from .. import __version__ as stips_version
 from ..utilities import OffsetPosition
 from ..utilities import overlapadd2
 from ..utilities import overlapaddparallel

stips/data/CreatePhoenixGrid.py

@@ -19,7 +19,7 @@
 import numpy as np
 import pysynphot as ps
 from stips.utilities import InstrumentList
-from stips import __version__ as stips_version_info
+from .. import __version__ as stips_version_info
 from astropy.io import fits as pyfits
 
 print("STIPS Version: {}".format(stips_version_info))

stips/instruments/wfi.py

@@ -15,7 +15,7 @@
 from .wfirst_instrument import WfirstInstrument
 from ..utilities import OffsetPosition
 
-from stips.version import __version__ as stips_version
+from .. import __version__ as stips_version
 
 class WFI(WfirstInstrument):
     __classtype__ = "detector"

stips/utilities/utilities.py

@@ -18,7 +18,7 @@
 from jwst_backgrounds.jbt import background
 from photutils.psf.models import GriddedPSFModel
 
-from stips.version import __version__ as __stips__version__
+from .. import __version__ as __stips__version__
 
 #-----------
 class classproperty(object):