Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix build system so packages can be made #316

Merged
merged 4 commits into from
Jan 24, 2017
Merged

fix build system so packages can be made #316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7d69584
fix spelling
kosack Jan 24, 2017
d4a549a
fixed bug in version.py and added version freeze to setup.py
kosack Jan 24, 2017
3fbe8b6
Merge branch 'master' of https://github.com/cta-observatory/ctapipe
kosack Jan 24, 2017
23ebcdf
correct list of packages in setup.py
kosack Jan 24, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions ctapipe/version.py
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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