Merge pull request #6 from sot/Ska.File

Implementation of setuptools_scm usage as described in sot/skare3/issues/240
sot · Jan 9, 2020 · 501e252 · 501e252
2 parents e371cc1 + 89bf0c3
commit 501e252
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/.git_archival.txt b/.git_archival.txt
@@ -0,0 +1 @@
+ref-names: $Format:%D$
diff --git a/.gitattributes b/.gitattributes
@@ -0,0 +1 @@
+.git_archival.txt  export-subst
diff --git a/Ska/File.py b/Ska/File.py
@@ -8,7 +8,9 @@
 import glob
 import contextlib
 
-__version__ = '3.4.1'
+import ska_helpers
+
+__version__ = ska_helpers.get_version(__package__)
 
 
 @contextlib.contextmanager

diff --git a/setup.py b/setup.py
@@ -1,14 +1,13 @@
 # Licensed under a 3-clause BSD style license - see LICENSE.rst
 from setuptools import setup
 
-from Ska.File import __version__
-
 setup(name='Ska.File',
       author = 'Tom Aldcroft',
       description='Various file utilities',
       author_email = 'taldcroft@cfa.harvard.edu',
       py_modules = ['Ska.File'],
-      version=__version__,
+      use_scm_version=True,
+      setup_requires=['setuptools_scm', 'setuptools_scm_git_archive'],
       zip_safe=False,
       packages=['Ska'],
       package_dir={'Ska' : 'Ska'},