Remove the assert in CommitData.parse() function

[stgit] / setup.py

diff --git a/setup.py b/setup.py
index 48d3631..12ed1db 100755 (executable)
--- a/setup.py
+++ b/setup.py
@@ -1,18 +1,88 @@
 #!/usr/bin/env python
 
+import sys, glob, os
 from distutils.core import setup
 
-from stgit.version import version
-
-setup(name = 'stgit',
-      version = version,
-      license = 'GPLv2',
-      author = 'Catalin Marinas',
-      author_email = 'catalin.marinas@gmail.org',
-      url = 'http://www.procode.org/stgit/',
-      description = 'Stacked GIT',
-      long_description = 'Push/pop utility on top of GIT',
-      scripts = ['stg', 'gitmergeonefile.py'],
-      packages = ['stgit'],
-      data_files = [('/etc', ['stgitrc'])],
-      )
+from stgit import version
+from stgit import commands, completion
+
+def __version_to_list(version):
+    """Convert a version string to a list of numbers or strings
+    """
+    ver_list = []
+    for p in version.split('.'):
+        try:
+            n = int(p)
+        except ValueError:
+            n = p
+        ver_list.append(n)
+    return ver_list
+
+def __check_min_version(min_ver, ver):
+    """Check whether ver is greater or equal to min_ver
+    """
+    min_ver_list = __version_to_list(min_ver)
+    ver_list = __version_to_list(ver)
+    return min_ver_list <= ver_list
+
+def __check_python_version():
+    """Check the minimum Python version
+    """
+    pyver = '.'.join(map(lambda x: str(x), sys.version_info))
+    if not __check_min_version(version.python_min_ver, pyver):
+        print >> sys.stderr, 'Python version %s or newer required. Found %s' \
+              % (version.python_min_ver, pyver)
+        sys.exit(1)
+
+def __check_git_version():
+    """Check the minimum GIT version
+    """
+    from stgit.run import Run
+    gitver = Run('git', '--version').output_one_line().split()[2]
+    if not __check_min_version(version.git_min_ver, gitver):
+        print >> sys.stderr, 'GIT version %s or newer required. Found %s' \
+              % (version.git_min_ver, gitver)
+        sys.exit(1)
+
+def __run_setup():
+    setup(name = 'stgit',
+          version = version.version,
+          license = 'GPLv2',
+          author = 'Catalin Marinas',
+          author_email = 'catalin.marinas@gmail.com',
+          url = 'http://www.procode.org/stgit/',
+          description = 'Stacked GIT',
+          long_description = 'Push/pop utility on top of GIT',
+          scripts = ['stg'],
+          packages = ['stgit', 'stgit.commands', 'stgit.lib'],
+          data_files = [
+            ('share/stgit/templates', glob.glob('templates/*.tmpl')),
+            ('share/stgit/examples', glob.glob('examples/*.tmpl')),
+            ('share/stgit/examples', ['examples/gitconfig']),
+            ('share/stgit/contrib', ['contrib/stgbashprompt.sh']),
+            ('share/stgit/completion', ['stgit-completion.bash'])
+            ])
+
+# Check the minimum versions required
+__check_python_version()
+__check_git_version()
+
+# ensure readable template files
+old_mask = os.umask(0022)
+
+version.write_builtin_version()
+
+# generate the python command list
+f = file('stgit/commands/cmdlist.py', 'w')
+commands.py_commands(commands.get_commands(allow_cached = False), f)
+f.close()
+
+# generate the bash completion script
+f = file('stgit-completion.bash', 'w')
+completion.write_completion(f)
+f.close()
+
+__run_setup()
+
+# restore the old mask
+os.umask(old_mask)