Skip to content

Commit

Permalink
Merge pull request #316 from kosack/master
Browse files Browse the repository at this point in the history
fix build system so packages can be made
  • Loading branch information
kosack authored Jan 24, 2017
2 parents 9b80938 + 23ebcdf commit 70f2732
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 6 deletions.
9 changes: 6 additions & 3 deletions ctapipe/version.py
Original file line number Diff line number Diff line change
Expand Up @@ -153,9 +153,12 @@ def get_version(pep440=False):
The file VERSION will need to be changed manually.
"""

git_version = format_git_describe(call_git_describe(), pep440=pep440)
if not git_version: # not a git repository
return read_release_version()
raw_git_version = call_git_describe()
if not raw_git_version: # not a git repository
return read_release_version()

git_version = format_git_describe(raw_git_version, pep440=pep440)

return git_version


Expand Down
2 changes: 1 addition & 1 deletion docs/coordinates/index.rst
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ transformations, e.g. precision pointing corrections using a pointing model.
much faster. All routines can accept arrays instead of single values.


Earth Orientiation Corrections
Earth Orientation Corrections
==============================

Polar motion and leap-second corrections are taken into account automatically
Expand Down
6 changes: 4 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import sys

# import ah_bootstrap
from setuptools import setup
from setuptools import setup, find_packages

# Get some values from the setup.cfg
from configparser import RawConfigParser
Expand Down Expand Up @@ -34,8 +34,10 @@
'ctapipe-flow = ctapipe.flow.flow:main'
]

package.version.update_release_version()

setup(name=PACKAGENAME,
packages=[PACKAGENAME],
packages=find_packages(),
version=package.version.get_version(pep440=True),
description=DESCRIPTION,
# these should be minimum list of what is needed to run (note
Expand Down

0 comments on commit 70f2732

Please sign in to comment.