Skip to content

Commit

Permalink
Merge pull request #1 from sot/py3
Browse files Browse the repository at this point in the history
Python 3 compatibility
  • Loading branch information
taldcroft authored Jan 20, 2017
2 parents 656b4a2 + e8f928d commit 55dbb09
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 2 deletions.
10 changes: 9 additions & 1 deletion cxotime/__init__.py
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
from .cxotime import CxoTime

__version__ = '0.1'
__version__ = '3.1'


def test(*args, **kwargs):
'''
Run py.test unit tests.
'''
import testr
return testr.test(*args, **kwargs)
10 changes: 9 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,18 @@

from cxotime import __version__

try:
from testr.setup_helper import cmdclass
except ImportError:
cmdclass = {}

setup(name='cxotime',
author='Tom Aldcroft',
description='Chandra Time class base on astropy Time',
author_email='taldcroft@cfa.harvard.edu',
version=__version__,
packages=['cxotime'],
zip_safe=False,
packages=['cxotime', 'cxotime.tests'],
tests_require=['pytest'],
cmdclass=cmdclass,
)

0 comments on commit 55dbb09

Please sign in to comment.