From b9b6644ae32d3d489dfe8ca61854dc26bcc75822 Mon Sep 17 00:00:00 2001
From: Patrick Totzke <patricktotzke@gmail.com>
Date: Wed, 1 Feb 2012 08:17:51 +0000
Subject: revert to hardcoded version strings

before, we tried to be smart and wrote
an auto-generated version string via `git describe`
to alot.VERSION at setup time that got read by alot.__init__
later on.

This reverts to a hardcoded version string in alot.__version__.
It makes tedious calls to `git update-index --assume-unchanged VERSION`
unnecessary and makes life easier for packagers.

closes issue #299
---
 alot/VERSION     |   1 -
 alot/__init__.py |   6 +--
 alot/version.py  | 115 -------------------------------------------------------
 3 files changed, 2 insertions(+), 120 deletions(-)
 delete mode 100644 alot/VERSION
 delete mode 100644 alot/version.py

(limited to 'alot')

diff --git a/alot/VERSION b/alot/VERSION
deleted file mode 100644
index 1ed3d926..00000000
--- a/alot/VERSION
+++ /dev/null
@@ -1 +0,0 @@
-0.21+
diff --git a/alot/__init__.py b/alot/__init__.py
index bef59344..d0cee6ce 100644
--- a/alot/__init__.py
+++ b/alot/__init__.py
@@ -1,8 +1,6 @@
-from version import read_version
-
 __productname__ = 'alot'
-__version__ = read_version()
-__copyright__ = "Copyright (C) 2011 Patrick Totzke"
+__version__ = '0.21+'
+__copyright__ = "Copyright (C) 2012 Patrick Totzke"
 __author__ = "Patrick Totzke"
 __author_email__ = "patricktotzke@gmail.com"
 __description__ = "Terminal MUA using notmuch mail"
diff --git a/alot/version.py b/alot/version.py
deleted file mode 100644
index 3cd06249..00000000
--- a/alot/version.py
+++ /dev/null
@@ -1,115 +0,0 @@
-# -*- coding: utf-8 -*-
-# Author: Douglas Creager <dcreager@dcreager.net>
-# This file is placed into the public domain.
-
-# It's customized for alot. changes:
-#   * read VERSION file relative to this file
-
-# Calculates the current version number.  If possible, this is the
-# output of “git describe”, modified to conform to the versioning
-# scheme that setuptools uses.  If “git describe” returns an error
-# (most likely because we're in an unpacked copy of a release tarball,
-# rather than in a git working copy), then we fall back on reading the
-# contents of the VERSION file.
-#
-# To use this script, simply import it your setup.py file, and use the
-# results of get_git_version() as your package version:
-#
-# from version import *
-#
-# setup(
-#     version=get_git_version(),
-#     .
-#     .
-#     .
-# )
-#
-# This will automatically update the VERSION file, if
-# necessary.  Note that the VERSION file should *not* be
-# checked into git; please add it to your top-level .gitignore file.
-#
-# You'll probably want to distribute the VERSION file in your
-# sdist tarballs; to do this, just create a MANIFEST.in file that
-# contains the following line:
-#
-#   include VERSION
-
-__all__ = ("get_git_version")
-
-import os.path
-VERSIONFILE = os.path.join(os.path.dirname(__file__), 'VERSION')
-
-try:
-    from subprocess import Popen, PIPE
-except ImportError:
-    import warnings
-    warnings.warn("Can't import subprocess module,"
-                  "git version will not be available.")
-
-
-def call_git_describe(abbrev=4):
-    try:
-        p = Popen(['git', 'describe', '--abbrev=%d' % abbrev, 'HEAD'],
-                  stdout=PIPE, stderr=PIPE)
-        p.stderr.close()
-        line = p.stdout.readlines()[0]
-        version = line.strip()
-        if version[:1] == 'v':
-            version = version[1:]
-        return version
-
-    except:
-        return None
-
-
-def read_version():
-    try:
-        f = open(VERSIONFILE, "r")
-
-        try:
-            version = f.readlines()[0]
-            return version.strip()
-
-        finally:
-            f.close()
-
-    except:
-        return None
-
-
-def write_version(version):
-    f = open(VERSIONFILE, "w")
-    f.write("%s\n" % version)
-    f.close()
-
-
-def generate_version(abbrev=4):
-    # Read in the version that's currently in VERSION.
-    release_version = read_version()
-
-    # First try to get the current version using “git describe”.
-    version = call_git_describe(abbrev)
-
-    # If that doesn't work, fall back on the value that's in
-    # RELEASE-VERSION.
-
-    if version is None:
-        version = release_version
-
-    # If we still don't have anything, that's an error.
-
-    if version is None:
-        raise ValueError("Cannot find the version number!")
-
-    # If the current version is different from what's in the
-    # RELEASE-VERSION file, update the file to be current.
-
-    if version != release_version:
-        write_version(version)
-
-    # Finally, return the current version.
-    return version
-
-
-if __name__ == "__main__":
-    print (get_git_version())
-- 
cgit v1.2.3