Skip to content

Commit

Permalink
Merge pull request #9 from sot/Ska.tdb
Browse files Browse the repository at this point in the history
Implementation of setuptools_scm usage as described in sot/skare3/issues/240
  • Loading branch information
javierggt authored Jan 9, 2020
2 parents 6506df1 + 61b7a53 commit ee6c0b2
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 6 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 Ska/tdb/__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 .tdb import *

__version__ = '3.5.1'
__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 @@ -53,7 +53,7 @@
# built documents.
#
# The full version, including alpha/beta/rc tags.
from Ska.tdb.version import version as release
from Ska.tdb import __version__ as release
# The short X.Y version.
version = '.'.join(release.split('.')[:2])

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

from Ska.tdb import __version__


try:
from testr.setup_helper import cmdclass
except ImportError:
Expand All @@ -15,7 +12,8 @@
url="http://cxc.harvard.edu/mta/ASPECT/tool_doc/pydocs/Ska.tdb",
description='Access to Chandra Telemetry Database (TDB)',
author_email='taldcroft@cfa.harvard.edu',
version=__version__,
use_scm_version=True,
setup_requires=['setuptools_scm', 'setuptools_scm_git_archive'],
zip_safe=False,
packages=['Ska', 'Ska.tdb', 'Ska.tdb.tests'],
tests_require=['pytest'],
Expand Down

0 comments on commit ee6c0b2

Please sign in to comment.