Skip to content

Commit

Permalink
Merge pull request #35 from sot/revert_scm
Browse files Browse the repository at this point in the history
Revert "Added changes to use setuptools_scm"
  • Loading branch information
javierggt authored Dec 17, 2019
2 parents c349b18 + 4af2518 commit e6da290
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 6 deletions.
4 changes: 1 addition & 3 deletions Chandra/Time/__init__.py
Original file line number Diff line number Diff line change
@@ -1,9 +1,7 @@
# Licensed under a 3-clause BSD style license - see LICENSE.rst
import ska_helpers

from .Time import *

__version__ = ska_helpers.get_version(__package__)
__version__ = '3.20.3'


def test(*args, **kwargs):
Expand Down
7 changes: 4 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,13 @@
import os
from Cython.Build import cythonize

from Chandra.Time import __version__

if (os.name == "nt"):
compile_args = ['/EHs', '/D_CRT_SECURE_NO_DEPRECATE']
else:
compile_args = ['-Wno-switch-enum', '-Wno-switch', '-Wno-switch-default',
'-Wno-deprecated', '-Wno-parentheses', '-stdlib=libc++']
'-Wno-deprecated', '-Wno-parentheses']

extensions = [Extension("*", ["Chandra/Time/_axTime3.pyx"],
extra_compile_args=compile_args)]
Expand All @@ -22,8 +24,7 @@
author='Tom Aldcroft',
description='Convert between various time formats relevant to Chandra',
author_email='taldcroft@cfa.harvard.edu',
use_scm_version=True,
setup_requires=['setuptools_scm', 'setuptools_scm_git_archive'],
version=__version__,
zip_safe=False,
packages=['Chandra', 'Chandra.Time', 'Chandra.Time.tests'],
ext_modules=cythonize(extensions),
Expand Down

0 comments on commit e6da290

Please sign in to comment.