Coherent version all-over

Author: pnuu

bin/halostack_cli.py

@@ -27,10 +27,11 @@
 from halostack.align import Align
 from halostack.helpers import (get_filenames, parse_enhancements,
                                get_two_points, read_config, intermediate_fname)
+from halostack import __version__
+
 import argparse
 import logging
 import platform
-import os
 
 # log pattern
 LOG_FMT = '%(asctime)s - %(name)s - %(levelname)s: %(message)s'
@@ -210,6 +211,8 @@ def main():
     parser.add_argument("-p", "--nprocs", dest="nprocs", metavar="INT",
                         type=int, default=None,
                         help="Number of parallel processes")
+    parser.add_argument("-v", "--version", action="version",
+                        version="Halostack %s" % (__version__))
     parser.add_argument('fname_in', metavar="FILE", type=str, nargs='*',
                         help='List of files')
 

doc/source/conf.py

@@ -12,7 +12,7 @@
 # serve to show the default.
 
 import sys, os
-
+from halostack import __major__, __minor__, __patch__, __version__
 import mock
 
 MOCK_MODULES = ['numpy', 'matplotlib', 'matplotlib.pyplot', 'PythonMagick']
@@ -47,16 +47,16 @@
 
 # General information about the project.
 project = u'halostack'
-copyright = u'2014, Panu Lahtinen'
+copyright = u'2014, 2015, Panu Lahtinen'
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = '0.1'
+version = '.'.join((__major__, __minor__))
 # The full version, including alpha/beta/rc tags.
-release = '0.1.0'
+release = '.'.join((version, __patch__))
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

halostack/__init__.py

@@ -0,0 +1,30 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# Copyright (c) 2014, 2015 Panu Lahtinen
+
+# Author(s):
+
+# Panu Lahtinen <pnuu+git@iki.fi>
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+"""Version file.
+"""
+
+__major__ = "0"
+__minor__ = "2"
+__patch__ = "0"
+
+__version__ = "v" + ".".join([__major__, __minor__, __patch__])

halostack/stack.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2014
+# Copyright (c) 2014, 2015, Panu Lahtinen
 
 # Author(s):
 

halostack/version.py

@@ -24,7 +24,7 @@
 """
 
 __major__ = "0"
-__minor__ = "0"
+__minor__ = "1"
 __patch__ = "0"
 
 __version__ = "v" + ".".join([__major__, __minor__, __patch__])

setup.py

@@ -24,12 +24,12 @@
 """
 from setuptools import setup
 import imp
-
-version = imp.load_source('halostack.version', 'halostack/version.py')
+from halostack import __version__
+# version = imp.load_source('halostack.version', 'halostack/version.py')
 
 setup(name="halostack",
-      version=version.__version__,
-      description='Halo photograph stacker',
+      version=__version__,
+      description='Halostack for stacking and enhancing halo photos',
       author='Panu Lahtinen',
       author_email='pnuu+git@iki.fi',
       classifiers=["Development Status :: 3 - Alpha",