put version into its own file to make it importable even if the package is not installed yet

Author: geier

doc/source/conf.py

@@ -15,13 +15,8 @@
 import sys
 import os
 
-try:
-    from khal import __version__
-except ImportError:
-    raise ImportError(
-        'Khal needs to be installed to correctly infer its version. '
-        'Please run `python setup.py develop` before building docs. '
-    )
+sys.path.append('../../')
+from version import VERSION
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
@@ -64,9 +59,9 @@
 # built documents.
 #
 # The short X.Y version.
-version = str(__version__)
+version = str(VERSION)
 # The full version, including alpha/beta/rc tags.
-release = str(__version__)
+release = str(VERSION)
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.

setup.py

@@ -1,52 +1,9 @@
 #!/usr/bin/env python2
 # vim: set ts=4 sw=4 expandtab sts=4 fileencoding=utf-8:
 
-import os
-import string
-import subprocess
-import warnings
-
 from setuptools import setup
 
-MAJOR = 0
-MINOR = 4
-PATCH = 0
-
-RELEASE = False
-
-VERSION = "{0}.{1}.{2}".format(MAJOR, MINOR, PATCH)
-
-if not RELEASE:
-    try:
-        try:
-            pipe = subprocess.Popen(
-                ["git", "describe", "--always", "--dirty", "--tags"],
-                stdout=subprocess.PIPE)
-        except EnvironmentError:
-            warnings.warn("WARNING: git not installed or failed to run")
-
-        revision = pipe.communicate()[0].strip().lstrip('v')
-        if pipe.returncode != 0:
-            warnings.warn("WARNING: couldn't get git revision")
-
-        if revision != VERSION:
-            revision = revision.lstrip(string.digits + '.')
-            VERSION += '.dev' + revision
-    except:
-        VERSION += '.dev'
-        warnings.warn("WARNING: git not installed or failed to run")
-
-
-def write_version():
-    """writes the khal/version.py file"""
-    template = """\
-__version__ = '{0}'
-"""
-    filename = os.path.join(
-        os.path.dirname(__file__), 'khal', 'version.py')
-    with open(filename, 'w') as versionfile:
-        versionfile.write(template.format(VERSION))
-        print("wrote khal/version.py with version={0}".format(VERSION))
+from version import write_version, VERSION
 
 write_version()
 

version.py

@@ -0,0 +1,47 @@
+#!/usr/bin/env python2
+# vim: set ts=4 sw=4 expandtab sts=4 fileencoding=utf-8:
+
+import os
+import string
+import subprocess
+import warnings
+
+MAJOR = 0
+MINOR = 4
+PATCH = 0
+
+RELEASE = False
+
+VERSION = "{0}.{1}.{2}".format(MAJOR, MINOR, PATCH)
+
+if not RELEASE:
+    try:
+        try:
+            pipe = subprocess.Popen(
+                ["git", "describe", "--always", "--dirty", "--tags"],
+                stdout=subprocess.PIPE)
+        except EnvironmentError:
+            warnings.warn("WARNING: git not installed or failed to run")
+
+        revision = pipe.communicate()[0].strip().lstrip('v')
+        if pipe.returncode != 0:
+            warnings.warn("WARNING: couldn't get git revision")
+
+        if revision != VERSION:
+            revision = revision.lstrip(string.digits + '.')
+            VERSION += '.dev' + revision
+    except:
+        VERSION += '.dev'
+        warnings.warn("WARNING: git not installed or failed to run")
+
+
+def write_version():
+    """writes the khal/version.py file"""
+    template = """\
+__version__ = '{0}'
+"""
+    filename = os.path.join(
+        os.path.dirname(__file__), 'khal', 'version.py')
+    with open(filename, 'w') as versionfile:
+        versionfile.write(template.format(VERSION))
+        print("wrote khal/version.py with version={0}".format(VERSION))