From 76b3da0057b64c07d11291ff78550731937c905d 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 --- mica/__init__.py | 5 ++++- setup.py | 5 ++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/mica/__init__.py b/mica/__init__.py index d333966e..c7b81191 100644 --- a/mica/__init__.py +++ b/mica/__init__.py @@ -1,5 +1,8 @@ # Licensed under a 3-clause BSD style license - see LICENSE.rst -__version__ = '4.19' + +import ska_helpers + +__version__ = ska_helpers.get_version(__package__) def test(*args, **kwargs): diff --git a/setup.py b/setup.py index 594acd70..9cf71992 100644 --- a/setup.py +++ b/setup.py @@ -4,8 +4,6 @@ from setuptools import setup from pathlib import Path -from mica import __version__ - try: from testr.setup_helper import cmdclass except ImportError: @@ -32,7 +30,8 @@ setup(name='mica', description='Mica aspects archive', - version=__version__, + use_scm_version=True, + setup_requires=['setuptools_scm', 'setuptools_scm_git_archive'], author='Jean Connelly', author_email='jconnelly@cfa.harvard.edu', license=license, From d11534c5e0161ac33cf6a3103ee216a54a94693f 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 00000000..95cb3eea --- /dev/null +++ b/.git_archival.txt @@ -0,0 +1 @@ +ref-names: $Format:%D$ diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..00a7b00c --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +.git_archival.txt export-subst