From 39e15e63ee9bd0ffbc4dbc83d5aeaccce8ed855d 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 --- Ska/ftp/__init__.py | 4 +++- setup.py | 5 ++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Ska/ftp/__init__.py b/Ska/ftp/__init__.py index 78192f7..193bdba 100644 --- a/Ska/ftp/__init__.py +++ b/Ska/ftp/__init__.py @@ -1,7 +1,9 @@ # Licensed under a 3-clause BSD style license - see LICENSE.rst +import ska_helpers + from .ftp import * -__version__ = '3.5.1' +__version__ = ska_helpers.get_version(__package__) def test(*args, **kwargs): diff --git a/setup.py b/setup.py index f1d3b03..b155aac 100755 --- a/setup.py +++ b/setup.py @@ -1,8 +1,6 @@ # Licensed under a 3-clause BSD style license - see LICENSE.rst from setuptools import setup -from Ska.ftp import __version__ - try: from testr.setup_helper import cmdclass except ImportError: @@ -13,7 +11,8 @@ description='Light wrapper around Python ftplib and paramiko.SFTPClient', author_email='taldcroft@cfa.harvard.edu', url='http://cxc.harvard.edu/mta/ASPECT/tool_doc/pydocs/Ska.ftp.html', - version=__version__, + use_scm_version=True, + setup_requires=['setuptools_scm', 'setuptools_scm_git_archive'], zip_safe=False, packages=['Ska', 'Ska.ftp', 'Ska.ftp.tests'], package_data={'Ska.ftp.tests': ['netrc']}, From b5051966c399617b66768c779651be7a0b66fe68 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