version string vanity

actually use the version string generated by git describe
if possible. Also, don't check in every change to the version file
and let its fallback content be "0.21+"

4 files changed, 4 insertions, 3 deletions

diff --git a/.gitignore b/.gitignore
index d10fd4c3..e99b5d01 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@
 /MANIFEST
 .gdb_history
 docs/_build/
+alot/VERSION
diff --git a/alot/VERSION b/alot/VERSION
index f877d9bd..1ed3d926 100644
--- a/alot/VERSION
+++ b/alot/VERSION
@@ -1 +1 @@
-0.21-dev
+0.21+
diff --git a/alot/version.py b/alot/version.py
index 1506c137..3cd06249 100644
--- a/alot/version.py
+++ b/alot/version.py
@@ -83,7 +83,7 @@ def write_version(version):
     f.close()
 
 
-def get_git_version(abbrev=4):
+def generate_version(abbrev=4):
     # Read in the version that's currently in VERSION.
     release_version = read_version()
 
diff --git a/setup.py b/setup.py
index 45f72cd0..f52940ba 100755
--- a/setup.py
+++ b/setup.py
@@ -6,7 +6,7 @@ import alot
 
 
 setup(name='alot',
-      version=alot.version.read_version(),
+      version=alot.version.generate_version(),
       description=alot.__description__,
       author=alot.__author__,
       author_email=alot.__author_email__,