Merge pull request #118 from pllim/relictify-relic

MNT: Replace relic with setuptools_scm

Author: pllim

.gitignore

@@ -1,6 +1,3 @@
-# RELIC files
-RELIC-INFO
-
 # Compiled files
 *.py[co]
 *.a

.gitmodules

@@ -2,12 +2,7 @@ include README.rst
 include LICENSE.md
 include CITATION
 
-include RELIC-INFO
-
 recursive-include doc *
-recursive-include relic *
-prune relic/.git
-prune relic/tests
 
 prune build
 prune doc/build

MANIFEST.in

@@ -10,12 +10,11 @@
 #
 # All configuration values have a default; values that are commented out
 # serve to show the default.
-
-import sys, os
+from pkg_resources import get_distribution
 
 # work around that annoying warning that pysynphot always prints
 import warnings
-with warnings.catch_warnings() :
+with warnings.catch_warnings():
     warnings.simplefilter('ignore')
     import pysynphot
 
@@ -50,16 +49,16 @@
 
 # General information about the project.
 project = u'pysynphot'
-copyright = u'2016, STScI'
+copyright = u'2019, STScI'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
-# The short X.Y version.
-version = pysynphot.__version__
 # The full version, including alpha/beta/rc tags.
-release = version.replace('.dev', '')
+release = get_distribution('pysynphot').version
+# The short X.Y version.
+version = '.'.join(release.split('.')[:2])
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

doc/source/conf.py

@@ -5,52 +5,48 @@
 """
 from __future__ import absolute_import
 
-# For backwards compatibility
+from pkg_resources import get_distribution, DistributionNotFound
+
 try:
-    from .version import *
-except ImportError:
-    __svn_version__ = 'none'
-    __full_svn_info__ = 'none'
-    __svn_revision__ = __svn_version__
-    __svn_full_info__ = __full_svn_info__
-else:
-    __svn_version__ = __version_commit__
-    __full_svn_info__ = '-'.join(
-        [__version__,
-         __version_post__,
-         __version_commit__,]) + ' ({0})'.format(__version_date__)
-    __svn_revision__ = __svn_version__
-    __svn_full_info__ = __full_svn_info__
+    __version__ = get_distribution(__name__).version
+except DistributionNotFound:
+    # package is not installed
+    __version__ = 'unknown'
 
+# For backwards compatibility
+__svn_version__ = 'none'
+__full_svn_info__ = 'none'
+__svn_revision__ = __svn_version__
+__svn_full_info__ = __full_svn_info__
 
 # UI:
 # AnalyticSpectra:
-from .spectrum import BlackBody, GaussianSource, FlatSpectrum
-from .spectrum import Powerlaw as PowerLaw
+from .spectrum import BlackBody, GaussianSource, FlatSpectrum  # noqa
+from .spectrum import Powerlaw as PowerLaw  # noqa
 # Tabular Spectra
-from .spectrum import FileSourceSpectrum as FileSpectrum
-from .spectrum import ArraySourceSpectrum as ArraySpectrum
-from .catalog import Icat
+from .spectrum import FileSourceSpectrum as FileSpectrum  # noqa
+from .spectrum import ArraySourceSpectrum as ArraySpectrum  # noqa
+from .catalog import Icat  # noqa
 # Analytic Spectral Elements
-from .spectrum import Box, UniformTransmission
+from .spectrum import Box, UniformTransmission  # noqa
 # Tabular Spectral Elements
-from .spectrum import FileSpectralElement as FileBandpass
-from .spectrum import ArraySpectralElement as ArrayBandpass
+from .spectrum import FileSpectralElement as FileBandpass  # noqa
+from .spectrum import ArraySpectralElement as ArrayBandpass  # noqa
 # Complicated spectral elements
-from .obsbandpass import ObsBandpass
-from .reddening import Extinction
+from .obsbandpass import ObsBandpass  # noqa
+from .reddening import Extinction  # noqa
 # Observations
-from .observation import Observation
+from .observation import Observation  # noqa
 # Other constructs
-from .observationmode import ObservationMode as Obsmode
-from numpy import arange as Waveset
+from .observationmode import ObservationMode as Obsmode  # noqa
+from numpy import arange as Waveset  # noqa
 # Get Vega
-from .spectrum import Vega
+from .spectrum import Vega  # noqa
 # Get cache
-from . import Cache
+from . import Cache  # noqa
 # Permit resetting refdata
-from .refs import setref, showref, getref
+from .refs import setref, showref, getref  # noqa
 # Others
-from .locations import get_data_filename
-from .spparser import parse_spec
-from . import tables
+from .locations import get_data_filename  # noqa
+from .spparser import parse_spec  # noqa
+from . import tables  # noqa

pysynphot/__init__.py

@@ -1,6 +1,6 @@
 [tool:pytest]
 minversion = 3.0
-norecursedirs = build doc/build commissioning planning relic pysynphot/src
+norecursedirs = build doc/build commissioning planning pysynphot/src
 addopts = -p no:warnings
 
 [flake8]

relic

@@ -1,37 +1,11 @@
 #!/usr/bin/env python
-import os
-import pkgutil
-import sys
 from glob import glob
 from numpy import get_include as np_include
 from setuptools import setup, Extension
-from subprocess import check_call, CalledProcessError
-
-
-if not pkgutil.find_loader('relic'):
-    relic_local = os.path.exists('relic')
-    relic_submodule = (relic_local and
-                       os.path.exists('.gitmodules') and
-                       not os.listdir('relic'))
-    try:
-        if relic_submodule:
-            check_call(['git', 'submodule', 'update', '--init', '--recursive'])
-        elif not relic_local:
-            check_call(['git', 'clone', 'https://github.com/jhunkeler/relic.git'])
-
-        sys.path.insert(1, 'relic')
-    except CalledProcessError as e:
-        print(e)
-        exit(1)
-
-import relic.release  # noqa
-
-version = relic.release.get_info()
-relic.release.write_template(version, 'pysynphot')
 
 setup(
     name='pysynphot',
-    version=version.pep386,
+    use_scm_version=True,
     author=('Vicki Laidler, Pey Lian Lim, Matt Davis, Robert Jedrzejewski, '
             'Ivo Busko'),
     author_email='[email protected]',
@@ -46,6 +20,7 @@
         'Topic :: Scientific/Engineering :: Astronomy',
         'Topic :: Software Development :: Libraries :: Python Modules',
     ],
+    setup_requires=['setuptools_scm'],
     install_requires=[
         'astropy',
         'numpy',