Merge pull request #323 from kosack/master

more fixes for version.py
cta-observatory · Feb 6, 2017 · 6e8a5b4 · 6e8a5b4
2 parents 0364a5f + 97392de
commit 6e8a5b4
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/MANIFEST.in b/MANIFEST.in
@@ -1,5 +1,6 @@
 include README.rst
 include CHANGES.rst
+include ctapipe/VERSION
 
 include setup.cfg
 

diff --git a/ctapipe/_version_cache.py b/ctapipe/_version_cache.py
@@ -0,0 +1 @@
+version='0.3.3.post29+gitea50c1f'
diff --git a/ctapipe/version.py b/ctapipe/version.py
@@ -30,7 +30,7 @@
 __all__ = ("get_version",)
 
 CURRENT_DIRECTORY = path.dirname(path.abspath(__file__))
-VERSION_FILE = path.join(CURRENT_DIRECTORY, "VERSION")
+VERSION_FILE = path.join(CURRENT_DIRECTORY, "_version_cache.py")
 
 GIT_COMMAND = "git"
 
@@ -107,8 +107,7 @@ def format_git_describe(git_str, pep440=False):
 def read_release_version():
     """Read version information from VERSION file"""
     try:
-        with open(VERSION_FILE, "r") as infile:
-            version = infile.read().strip()
+        from ._version_cache import version
         if len(version) == 0:
             version = None
         return version
@@ -130,7 +129,7 @@ def update_release_version(pep440=False):
     """
     version = get_version(pep440=pep440)
     with open(VERSION_FILE, "w") as outfile:
-        outfile.write(version)
+        outfile.write("version='{}'".format(version))
         outfile.write("\n")