X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/stgit/blobdiff_plain/4e72d22a08687eb19c1a9358d0b7bc5bdf932eb7..edca53204c2461fd451bf3a8bbb18e59c6260523:/setup.py?ds=sidebyside diff --git a/setup.py b/setup.py index d90cf5b..10b3715 100755 --- a/setup.py +++ b/setup.py @@ -4,7 +4,6 @@ import sys, glob, os from distutils.core import setup from stgit.version import version, git_min_ver, python_min_ver -from stgit.run import Run def __version_to_list(version): """Convert a version string to a list of numbers or strings @@ -28,7 +27,7 @@ def __check_min_version(min_ver, ver): def __check_python_version(): """Check the minimum Python version """ - pyver = '.'.join(str(n) for n in sys.version_info) + pyver = '.'.join(map(lambda x: str(x), sys.version_info)) if not __check_min_version(python_min_ver, pyver): print >> sys.stderr, 'Python version %s or newer required. Found %s' \ % (python_min_ver, pyver) @@ -37,6 +36,7 @@ def __check_python_version(): 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(git_min_ver, gitver): print >> sys.stderr, 'GIT version %s or newer required. Found %s' \