Skip to content

Commit

Permalink
Merge pull request #39 from sot/scm_version
Browse files Browse the repository at this point in the history
Use setuptools_scm for single-source version
  • Loading branch information
jeanconn authored Jan 9, 2020
2 parents 96e824e + 66e883e commit 8599414
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 5 deletions.
1 change: 1 addition & 0 deletions .git_archival.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ref-names: $Format:%D$
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.git_archival.txt export-subst
4 changes: 3 additions & 1 deletion agasc/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
# Licensed under a 3-clause BSD style license - see LICENSE.rst
import ska_helpers

from .agasc import *

__version__ = '4.8'
__version__ = ska_helpers.get_version(__package__)


def test(*args, **kwargs):
Expand Down
2 changes: 1 addition & 1 deletion doc/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
# built documents.
#
# The full version, including alpha/beta/rc tags.
from agasc.version import version as release
from agasc import __version__ as release
# The short X.Y version.
version = '.'.join(release.split('.')[:2])

Expand Down
5 changes: 2 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
# Licensed under a 3-clause BSD style license - see LICENSE.rst
from setuptools import setup

from agasc import __version__

try:
from testr.setup_helper import cmdclass
except ImportError:
cmdclass = {}

setup(name='agasc',
version=__version__,
use_scm_version=True,
setup_requires=['setuptools_scm', 'setuptools_scm_git_archive'],
description='AGASC catalog access',
author='Jean Connelly, Tom Aldcroft',
author_email='taldcroft@cfa.harvard.edu',
Expand Down

0 comments on commit 8599414

Please sign in to comment.