Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Check python version >= 3.2 when running setup script

Browse Source
This commit is contained in:
Nick Hall 2015-03-01 16:37:48 +00:00
parent c800524955
commit b89cdeb077
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
setup.py
View File

@ -29,9 +29,8 @@ Gramps distutils module.
#check python version first #check python version first
import sys import sys
if sys.version_info < (3, 2):
if (sys.version_info < (2, 7) or ( (3,0) <= sys.version_info < (3, 2))): raise SystemExit("Gramps requires Python 3.2 or later.")
raise SystemExit("""Gramps requires Python 2.7 or later, or Python 3.2 or later.""")
from distutils import log from distutils import log
from distutils.core import setup, Command from distutils.core import setup, Command
@ -42,8 +41,6 @@ import os
import glob import glob
import codecs import codecs
import subprocess import subprocess
if sys.version_info[0] < 3:
import commands
from stat import ST_MODE from stat import ST_MODE
import io import io
from gramps.version import VERSION from gramps.version import VERSION
@ -72,8 +69,7 @@ def intltool_version():
try: try:
ver, ret = subprocess.Popen(cmd ,stdout=subprocess.PIPE, ver, ret = subprocess.Popen(cmd ,stdout=subprocess.PIPE,
stderr=subprocess.PIPE, shell=True).communicate() stderr=subprocess.PIPE, shell=True).communicate()
if sys.version_info[0] > 2: ver = ver.decode("utf-8")
ver = ver.decode("utf-8")
if ver > "": if ver > "":
version_str = ver version_str = ver
else: else:
@ -82,10 +78,7 @@ def intltool_version():
return (0,0,0) return (0,0,0)
else: else:
cmd = 'intltool-update --version | head -1 | cut -d" " -f3' cmd = 'intltool-update --version | head -1 | cut -d" " -f3'
if sys.version_info[0] < 3: retcode, version_str = subprocess.getstatusoutput(cmd)
retcode, version_str = commands.getstatusoutput(cmd)
else:
retcode, version_str = subprocess.getstatusoutput(cmd)
if retcode != 0: if retcode != 0:
return None return None
return tuple([int(num) for num in version_str.split('.')]) return tuple([int(num) for num in version_str.split('.')])
@ -124,10 +117,7 @@ def build_trans(build_cmd):
os.remove(mo_file) os.remove(mo_file)
msg = 'ERROR: Building language translation files failed.' msg = 'ERROR: Building language translation files failed.'
ask = msg + '\n Continue building y/n [n] ' ask = msg + '\n Continue building y/n [n] '
if sys.version_info[0] < 3: reply = input(ask)
reply = raw_input(ask)
else:
reply = input(ask)
if reply in ['n', 'N']: if reply in ['n', 'N']:
raise SystemExit(msg) raise SystemExit(msg)
@ -252,8 +242,6 @@ class install(_install):
with io.open(resource_file, 'w', encoding='utf-8', with io.open(resource_file, 'w', encoding='utf-8',
errors='strict') as fp: errors='strict') as fp:
path = os.path.abspath(os.path.join(self.install_data, 'share')) path = os.path.abspath(os.path.join(self.install_data, 'share'))
if sys.version_info[0] < 3:
path = unicode(path)
fp.write(path) fp.write(path)
_install.run(self) _install.run(self)