Set minimum python version required to 3.2
This commit is contained in:
Nick Hall
parent
4f72a8bc6a
commit
1a661bcc3d
4
INSTALL
4
INSTALL
@ -12,7 +12,7 @@ version by deleting the installed directories. For example, if your installation
|
||||
If you installed with a package manager you might instead need to remove
|
||||
/usr/local/lib/pythonx.x/dist-packages/gramps
|
||||
|
||||
replacing pythonx.x with the python version you used, e.g. python2.7.
|
||||
replacing pythonx.x with the python version you used, e.g. python3.4.
|
||||
Also remove any gramps .egg files that are installed along with the gramps
|
||||
directory and the file /usr/local/bin/gramps.
|
||||
|
||||
@ -49,7 +49,7 @@ things like MIME type and desktop entries.
|
||||
See below for ways to invoke Gramps.
|
||||
|
||||
Typical install directories in linux (ubuntu) are:
|
||||
* /usr/local/lib/python2.7/dist-packages/gramps/ : the gramps python module
|
||||
* /usr/local/lib/python3.4/dist-packages/gramps/ : the gramps python module
|
||||
* /usr/local/share/mime-info : mime info so gramps opens files automatically
|
||||
* /usr/local/share/icons/gnome : our icons
|
||||
* /usr/local/share/doc/gramps : documentation, also example .gramps and .gedcom
|
||||
|
||||
4
README
4
README
@ -5,13 +5,13 @@ Please read the INSTALL file if you intend to build from source.
|
||||
Requirements
|
||||
--------------------------------
|
||||
The following packages *MUST* be installed in order for Gramps to work:
|
||||
Python 2.7 or greater, Python 3.2 or greater (or both python versions)
|
||||
Python 3.2 or greater
|
||||
GTK 3.0 or greater
|
||||
pygobject 3.3.2 or greater
|
||||
cairo, pango, pangocairo with introspection bindings (the gi packages)
|
||||
librsvg2 (svg icon view)
|
||||
xdg-utils
|
||||
bsddb3 is required for Python 3.2 (not python 2.7)
|
||||
bsddb3
|
||||
|
||||
The following package is needed for full translation of the interface
|
||||
to your language:
|
||||
|
||||
@ -27,14 +27,7 @@
|
||||
# Python modules
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
from __future__ import print_function, unicode_literals
|
||||
|
||||
import sys
|
||||
## hack to avoid mentioning 'utf8' encoding everywhere unicode or str is is used
|
||||
if sys.version_info[0] < 3:
|
||||
reload(sys)
|
||||
sys.setdefaultencoding('utf8')
|
||||
##
|
||||
import os
|
||||
import signal
|
||||
|
||||
@ -46,7 +39,7 @@ from subprocess import Popen, PIPE
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
#
|
||||
# GRAMPS modules
|
||||
# Gramps modules
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
from .gen.const import APP_GRAMPS, USER_DIRLIST, HOME_DIR
|
||||
@ -132,7 +125,7 @@ _ = glocale.translation.gettext
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
|
||||
MIN_PYTHON_VERSION = (2, 7, 0, '', 0)
|
||||
MIN_PYTHON_VERSION = (3, 2, 0, '', 0)
|
||||
if not sys.version_info >= MIN_PYTHON_VERSION :
|
||||
logging.warning(_("Your Python version does not meet the "
|
||||
"requirements. At least python %(v1)d.%(v2)d.%(v3)d is needed to"
|
||||
@ -143,11 +136,9 @@ if not sys.version_info >= MIN_PYTHON_VERSION :
|
||||
'v3': MIN_PYTHON_VERSION[2]})
|
||||
sys.exit(1)
|
||||
|
||||
if sys.version_info[0] >= 3:
|
||||
#check if bsddb3 is installed
|
||||
try:
|
||||
try:
|
||||
import bsddb3
|
||||
except ImportError:
|
||||
except ImportError:
|
||||
logging.warning(_("\nYou don't have the python bsddb3 package installed."
|
||||
" This package is needed to start Gramps.\n\n"
|
||||
"Gramps will terminate now."))
|
||||
@ -155,7 +146,7 @@ if sys.version_info[0] >= 3:
|
||||
|
||||
#-------------------------------------------------------------------------
|
||||
#
|
||||
# gramps libraries
|
||||
# Gramps libraries
|
||||
#
|
||||
#-------------------------------------------------------------------------
|
||||
try:
|
||||
@ -268,13 +259,8 @@ def show_settings():
|
||||
pyicu_str = 'not found'
|
||||
icu_str = 'not found'
|
||||
|
||||
from .gen.config import config
|
||||
usebsddb3 = config.get('preferences.use-bsddb3') or sys.version_info[0] >= 3
|
||||
try:
|
||||
if usebsddb3:
|
||||
import bsddb3 as bsddb
|
||||
else:
|
||||
import bsddb
|
||||
bsddb_str = bsddb.__version__
|
||||
bsddb_db_str = str(bsddb.db.version()).replace(', ', '.')\
|
||||
.replace('(', '').replace(')', '')
|
||||
@ -330,10 +316,6 @@ def show_settings():
|
||||
print (' gtk++ : %s' % gtkver_str)
|
||||
print (' pygobject : %s' % pygobjectver_str)
|
||||
print (' pango : %s' % pangover_str)
|
||||
if usebsddb3:
|
||||
print (' Using bsddb3')
|
||||
else:
|
||||
print (' Not using bsddb3')
|
||||
print (' bsddb : %s' % bsddb_str)
|
||||
print (' bsddb.db : %s' % bsddb_db_str)
|
||||
print (' cairo : %s' % cairover_str)
|
||||
@ -433,22 +415,15 @@ def run():
|
||||
return error
|
||||
startgtkloop(error, argpars)
|
||||
else:
|
||||
#CLI use of GRAMPS
|
||||
#CLI use of Gramps
|
||||
|
||||
#Ensure that output is encoded correctly to stdout and
|
||||
#stderr. This is much less cumbersome and error-prone than
|
||||
#encoding individual outputs and better handles the
|
||||
#differences between Python 2 and Python 3:
|
||||
#encoding individual outputs:
|
||||
try:
|
||||
_encoding = sys.stdout.encoding or sys.getdefaultencoding()
|
||||
except:
|
||||
_encoding = "UTF-8"
|
||||
if sys.version_info[0] < 3:
|
||||
sys.stdout = codecs.getwriter(_encoding)(sys.stdout,
|
||||
'backslashreplace')
|
||||
sys.stderr = codecs.getwriter(_encoding)(sys.stderr,
|
||||
'backslashreplace')
|
||||
else:
|
||||
sys.stdout = codecs.getwriter(_encoding)(sys.stdout.detach(),
|
||||
'backslashreplace')
|
||||
sys.stderr = codecs.getwriter(_encoding)(sys.stderr.detach(),
|
||||
|
||||
Loading…
Reference in New Issue
Block a user