Skip to content

Commit

Permalink
Merge pull request #23 from jzuhone/scm
Browse files Browse the repository at this point in the history
Code changes necessary for SCM versioning
  • Loading branch information
jzuhone authored Jan 22, 2020
2 parents 280dce5 + 2c8f881 commit 4acaecc
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 2 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
5 changes: 4 additions & 1 deletion acis_thermal_check/__init__.py
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
__version__ = "2.9.0"
import ska_helpers

__version__ = ska_helpers.get_version(__package__)

from acis_thermal_check.main import \
ACISThermalCheck, \
Expand All @@ -7,6 +9,7 @@
calc_off_nom_rolls, get_options, \
get_acis_limits, mylog


def test(*args, **kwargs):
'''
Run py.test unit tests.
Expand Down
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@

setup(name='acis_thermal_check',
packages=["acis_thermal_check"],
version=__version__,
use_scm_version=True,
setup_requires=['setuptools_scm', 'setuptools_scm_git_archive'],
description='ACIS Thermal Model Library',
author='John ZuHone',
author_email='[email protected]',
Expand Down

0 comments on commit 4acaecc

Please sign in to comment.