ikotler
diff --git a/‎pythonect/__init__.py‎
Lines changed: 2 additions & 4 deletions b/‎pythonect/__init__.py‎
Lines changed: 2 additions & 4 deletions
diff --git a/‎setup.py‎
Lines changed: 70 additions & 12 deletions b/‎setup.py‎
Lines changed: 70 additions & 12 deletions
@@ -28,7 +28,6 @@
 
 """Parse and execute Pythonect code"""
 
-import sys
 
 __version__ = '0.0.0dev0'
 
@@ -42,8 +41,7 @@
 
     __version__ = get_version()
 
-if (sys.argv[0] != 'setup.py') or (sys.argv[0] == 'setup.py' and sys.argv[1] in ['test', 'nosetests']):
 
-    # API
+# API
 
-    from internal.eval import eval, parse
+from internal.eval import eval, parse
@@ -43,11 +43,8 @@
 import sys
 import distutils.core
 import distutils.command.build
-
-
-# Local imports
-
-import pythonect
+import subprocess
+import re
 
 
 # Functions
@@ -56,7 +53,69 @@ def _mk_versiondotpy():
 
     with open('pythonect/_version.py', 'wt') as f:
 
-        f.write('# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN.\n__version__ = \'' + pythonect.__version__ + '\'\n')
+        f.write('# DO NOT EDIT THIS FILE BY HAND -- YOUR CHANGES WILL BE OVERWRITTEN.\n__version__ = \'' + _safe_get_version() + '\'\n')
+
+
+def __get_git_version():
+
+    version = "0.0.0.dev0"
+
+    try:
+
+        git = subprocess.Popen(['git', 'describe'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+
+        git.stderr.close()
+
+        git_output = git.stdout.readlines()[0]
+
+        git_ver = re.match('^\w+(?P<MAJOR>\d+)\.(?P<MINOR>\d+)(\.(?P<MICRO>\d+)(\-(?P<DEV>\d+))?)?', git_output)
+
+        if git_ver is not None:
+
+            # MAJOR.MINOR
+
+            version = git_ver.group('MAJOR') + '.' + git_ver.group('MINOR')
+
+            if git_ver.groupdict('MICRO') is not None:
+
+                # MAJOR.MINOR.MICRO
+
+                version = version + '.' + git_ver.group('MICRO')
+
+                if git_ver.groupdict('DEV') is not None:
+
+                    # MAJOR.MINOR.MICRO-DEV
+
+                    version = version + '.dev' + git_ver.group('DEV')
+
+    except Exception as e:
+
+        pass
+
+    return version
+
+
+def _safe_get_version():
+
+    version = '0.0.0dev0'
+
+    try:
+
+        tmp_globals = {}
+
+        # Tarball?
+
+        execfile('pythonect/_version.py', tmp_globals)
+
+        version = tmp_globals['__version__']
+
+    except Exception:
+
+        # Git repository?
+
+        version = __get_git_version()
+
+    return version
 
 
 # Classes
@@ -66,20 +125,19 @@ class Version(distutils.core.Command):
     description = ""
     user_options = []
 
-    def initialize_options (self):
+    def initialize_options(self):
         pass
 
-
-    def finalize_options (self):
+    def finalize_options(self):
         pass
 
-    def run (self):
+    def run(self):
 
         # Generate `_version.py`
 
         _mk_versiondotpy()
 
-        print "*** Pythonect Version %s ***" % (pythonect.__version__)
+        print "*** Pythonect Version %s ***" % (_safe_get_version())
 
 
 # Entry Point
@@ -102,7 +160,7 @@ def run (self):
 
     setupconf = dict(
         name='Pythonect',
-        version=pythonect.__version__,
+        version=_safe_get_version(),
         author='Itzik Kotler',
         author_email='xorninja@gmail.com',
         url='http://www.pythonect.org/',