Skip to content

Commit

Permalink
Merge pull request #17 from sot/Ska.ftp
Browse files Browse the repository at this point in the history
Implementation of setuptools_scm usage as described in sot/skare3/issues/240
  • Loading branch information
javierggt authored Jan 9, 2020
2 parents a607042 + b505196 commit 6c00602
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 4 deletions.
1 change: 1 addition & 0 deletions .git_archival.txt
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
ref-names: $Format:%D$
1 change: 1 addition & 0 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
.git_archival.txt export-subst
4 changes: 3 additions & 1 deletion Ska/ftp/__init__.py
Original file line number Diff line number Diff line change
@@ -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):
Expand Down
5 changes: 2 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
@@ -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:
Expand All @@ -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']},
Expand Down

0 comments on commit 6c00602

Please sign in to comment.