Merge branch 'hotfix/0.2.7'

Author: alexrudy

AstroObject/AnalyticSpectra.py

@@ -4,7 +4,7 @@
 #  
 #  Created by Alexander Rudy on 2011-10-12.
 #  Copyright 2011 Alexander Rudy. All rights reserved.
-#  Version 0.2.6
+#  Version 0.2.7
 # 
 
 # Parent Modules

AstroObject/AnalyticSpectraObjects.py

@@ -4,7 +4,7 @@
 #  
 #  Created by Alexander Rudy on 2011-10-12.
 #  Copyright 2011 Alexander Rudy. All rights reserved.
-#  Version 0.2.6
+#  Version 0.2.7
 # 
 
 # Parent Modules

AstroObject/AstroFITS.py

@@ -4,7 +4,7 @@
 #  
 #  Created by Alexander Rudy on 2011-11-08.
 #  Copyright 2011 Alexander Rudy. All rights reserved.
-#  Version 0.2.6
+#  Version 0.2.7
 # 
 
 # Parent Modules

AstroObject/AstroImage.py

@@ -4,7 +4,7 @@
 #  
 #  Created by Alexander Rudy on 2011-04-28.
 #  Copyright 2011 Alexander Rudy. All rights reserved.
-#  Version 0.2.6
+#  Version 0.2.7
 # 
 
 # Parent Modules

AstroObject/AstroObject.py

@@ -4,7 +4,7 @@
 #  
 #  Created by Alexander Rudy on 2011-10-19.
 #  Copyright 2011 Alexander Rudy. All rights reserved.
-#  Version 0.2.6
+#  Version 0.2.7
 # 
 
 # This file maintains compatability with the 0.2 API for base classes

AstroObject/AstroObjectBase.py

@@ -4,7 +4,7 @@
 #  
 #  Created by Alexander Rudy on 2011-10-12.
 #  Copyright 2011 Alexander Rudy. All rights reserved.
-#  Version 0.2.6
+#  Version 0.2.7
 # 
 
 

AstroObject/AstroSpectra.py

@@ -4,7 +4,7 @@
 #  
 #  Created by Alexander Rudy on 2011-10-07.
 #  Copyright 2011 Alexander Rudy. All rights reserved.
-#  Version 0.2.6
+#  Version 0.2.7
 # 
 
 

AstroObject/Utilities.py

@@ -4,7 +4,7 @@
 #  
 #  Created by Alexander Rudy on 2011-10-07.
 #  Copyright 2011 Alexander Rudy. All rights reserved.
-#  Version 0.2.6
+#  Version 0.2.7
 #
 
 import matplotlib as mpl
@@ -29,7 +29,7 @@ def enable_Console():
     """docstring for enable_Console"""
     logging.getLogger('').addHandler(console)
 
-def getVersion(rel=__name__,filename="../VERSION",getTuple=False):
+def getVersion(rel=__name__,filename="VERSION",getTuple=False):
     """Returns the version number as either a string or tuple. The version number is retrieved from the "VERSION" file, which should contain just the text for the version and nothing else. When the version is returned as a tuple, each component (level) of the version number is a seperate, integer element of the tuple."""
     string = resource_string(rel,filename)
     if getTuple:

AstroObject/VERSION

@@ -0,0 +1 @@
+0.2.7

AstroObject/__init__.py

@@ -4,13 +4,13 @@
 #  
 #  Created by Alexander Rudy on 2011-10-07.
 #  Copyright 2011 Alexander Rudy. All rights reserved.
-#  Version 0.2.6
+#  Version 0.2.7
 #  
 
 import logging,time,sys,os
 
 
-__version__ = '0.2.6'
+__version__ = '0.2.7'
 
 __all__ = ['AnalyticSpectra','AstroImage','AstroObjectBase','AstroSpectra','Utilities']
 

Docs/source/conf.py

@@ -48,9 +48,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = '0.2.6'
+version = '0.2.7'
 # The full version, including alpha/beta/rc tags.
-release = '0.2.6'
+release = '0.2.7'
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

README.md

@@ -5,7 +5,7 @@
  Created by Alexander Rudy on 2011-10-07.
  Copyright 2011 Alexander Rudy. All rights reserved.
 
-  Version 0.2.6
+  Version 0.2.7
 
 ---
 

VERSION

@@ -1 +1 @@
-0.2.6
+0.2.7

bump-version.sh

@@ -25,12 +25,14 @@ then
 fi
 
 VSPECFILE="VERSION"
+AVSPECFILE="AstroObject/VERSION"
 
 VERSION=`cat $VSPECFILE`
 
 echo "Version is currently $VERSION, changing to $1"
 
 echo "$1" > $VSPECFILE
+echo "$1" > $AVSPECFILE
 
 VERSION=`cat $VSPECFILE`
 

setup.py

@@ -1,11 +1,13 @@
 from setuptools import setup, find_packages
 setup(
     name = "AstroObject",
-    version = "0.2.6",
+    version = "0.2.7",
     py_modules=["AstroObject"],
     packages = find_packages(
         exclude=['tests.*'],
         ),
+    package_data = {'':['VERSION','README.md','LICENCE']},
+    include_package_data = True,
     exclude_package_data = {'': ['.gitignore','bump-version.sh','distribute.sh'], 'Docs/build':['*.rst']},
     install_requires = ['pyfits>=2.4','numpy>=1.6','scipy>=0.9','matplotlib>=1.1'],
     test_suite = 'tests',