diff --git a/ctapipe/version.py b/ctapipe/version.py index 7237bb581db..e388b454a12 100644 --- a/ctapipe/version.py +++ b/ctapipe/version.py @@ -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 diff --git a/docs/coordinates/index.rst b/docs/coordinates/index.rst index 38507213d7d..7fdc1277efc 100644 --- a/docs/coordinates/index.rst +++ b/docs/coordinates/index.rst @@ -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 diff --git a/setup.py b/setup.py index ee45dfbb6e0..7d8befd4319 100755 --- a/setup.py +++ b/setup.py @@ -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 @@ -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