From f6644c498f737546343807e2de8cb848e2945697 Mon Sep 17 00:00:00 2001 From: Javier Gonzalez Date: Tue, 17 Dec 2019 12:57:36 -0500 Subject: [PATCH 1/2] 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 297c3e0..1ebe4b3 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 3e8fb8a..b81bd21 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', From 8d7bd870b7528afd7d5726aca49f6b17511cbbd9 Mon Sep 17 00:00:00 2001 From: Javier Gonzalez Date: Fri, 20 Dec 2019 11:42:17 -0500 Subject: [PATCH 2/2] added files for scm git archive --- .git_archival.txt | 1 + .gitattributes | 1 + 2 files changed, 2 insertions(+) create mode 100644 .git_archival.txt create mode 100644 .gitattributes diff --git a/.git_archival.txt b/.git_archival.txt new file mode 100644 index 0000000..95cb3ee --- /dev/null +++ b/.git_archival.txt @@ -0,0 +1 @@ +ref-names: $Format:%D$ diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..00a7b00 --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +.git_archival.txt export-subst