common: remove get_version

bin/lulu

@@ -11,7 +11,7 @@ sys.path.insert(1, os.path.join(_filepath, _srcdir))
 if sys.version_info[0] == 3:
     import lulu
     if __name__ == '__main__':
-        lulu.main(repo_path=_filepath)
+        lulu.main()
 else:  # Python 2
     from lulu.util import log
     log.e('[fatal] Python 3 is required!')

lulu/common.py

@@ -20,7 +20,6 @@
 from lulu import config
 from lulu.util import log, term
 from lulu.version import __version__
-from lulu.util.git import get_version
 from lulu import json_output as json_output_
 from lulu.util.strings import (
     get_filename,
@@ -1176,9 +1175,7 @@ def script_main(download, download_playlist, **kwargs):
     logging.basicConfig(format='[%(levelname)s] %(message)s')
 
     def print_version():
-        version = get_version(
-            kwargs['repo_path'] if 'repo_path' in kwargs else __version__
-        )
+        version = __version__
         log.i(
             'version {}, a tiny downloader that scrapes the web.'.format(
                 version

lulu/util/git.py

@@ -1,39 +1,18 @@
 #!/usr/bin/env python
 
 import os
-import subprocess
-from ..version import __version__
+
 
 def get_head(repo_path):
     """Get (branch, commit) from HEAD of a git repo."""
     try:
-        ref = open(os.path.join(repo_path, '.git', 'HEAD'), 'r').read().strip()[5:].split('/')
+        ref = open(
+            os.path.join(repo_path, '.git', 'HEAD'), 'r'
+        ).read().strip()[5:].split('/')
         branch = ref[-1]
-        commit = open(os.path.join(repo_path, '.git', *ref), 'r').read().strip()[:7]
+        commit = open(
+            os.path.join(repo_path, '.git', *ref), 'r'
+        ).read().strip()[:7]
         return branch, commit
-    except:
+    except Exception:
         return None
-
-def get_version(repo_path):
-    try:
-        version = __version__.split('.')
-        major, minor, cn = [int(i) for i in version]
-        p = subprocess.Popen(['git',
-                              '--git-dir', os.path.join(repo_path, '.git'),
-                              '--work-tree', repo_path,
-                              'rev-list', 'HEAD', '--count'],
-                             stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        raw, err = p.communicate()
-        c_head = int(raw.decode('ascii'))
-        q = subprocess.Popen(['git',
-                              '--git-dir', os.path.join(repo_path, '.git'),
-                              '--work-tree', repo_path,
-                              'rev-list', 'master', '--count'],
-                             stdout=subprocess.PIPE, stderr=subprocess.PIPE)
-        raw, err = q.communicate()
-        c_master = int(raw.decode('ascii'))
-        cc = c_head - c_master
-        assert cc
-        return '%s.%s.%s' % (major, minor, cn + cc)
-    except:
-        return __version__