From f6644c498f737546343807e2de8cb848e2945697 Mon Sep 17 00:00:00 2001 From: Javier Gonzalez Date: Tue, 17 Dec 2019 12:57:36 -0500 Subject: [PATCH] Added changes to use setuptools_scm --- chandra_aca/__init__.py | 4 +++- setup.py | 5 ++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/chandra_aca/__init__.py b/chandra_aca/__init__.py index 297c3e07..1ebe4b3d 100644 --- a/chandra_aca/__init__.py +++ b/chandra_aca/__init__.py @@ -1,7 +1,9 @@ # Licensed under a 3-clause BSD style license - see LICENSE.rst from .transform import * # noqa -__version__ = '4.28' +import ska_helpers + +__version__ = ska_helpers.get_version(__package__) def test(*args, **kwargs): diff --git a/setup.py b/setup.py index 3e8fb8ab..b81bd219 100644 --- a/setup.py +++ b/setup.py @@ -1,6 +1,4 @@ # Licensed under a 3-clause BSD style license - see LICENSE.rst -from chandra_aca import __version__ - from setuptools import setup try: @@ -12,7 +10,8 @@ author='Jean Connelly, Tom Aldcroft', description='Chandra Aspect Camera Tools', author_email='jconnelly@cfa.harvard.edu', - version=__version__, + use_scm_version=True, + setup_requires=['setuptools_scm', 'setuptools_scm_git_archive'], zip_safe=False, packages=['chandra_aca', 'chandra_aca.tests'], package_data={'chandra_aca.tests': ['data/*.txt', 'data/*.dat',