solved the 'difficult to install' pygtk in '.travis.yml'

bauble/__init__.py

@@ -31,7 +31,7 @@
 """
 version_tuple = version.split('.')
 
-import bauble.i18n  # bauble.i18n needs version_tuple
+from bauble.i18n import _
 
 
 def main_is_frozen():

bauble/btypes.py

@@ -16,12 +16,9 @@
 # You should have received a copy of the GNU General Public License
 # along with bauble.classic. If not, see <http://www.gnu.org/licenses/>.
 
-import datetime
-import re
-
 import dateutil.parser as date_parser
 import sqlalchemy.types as types
-import sqlalchemy.exc as exc
+from bauble.i18n import _
 
 import bauble.error as error
 

bauble/connmgr.py

@@ -10,10 +10,10 @@
 import traceback
 
 import gtk
-from sqlalchemy import *
 
+from bauble.i18n import _
 import bauble.utils as utils
-from bauble.error import check, CheckConditionError
+from bauble.error import check
 import bauble
 import bauble.paths as paths
 from bauble.prefs import prefs

bauble/db.py

@@ -3,8 +3,8 @@
 
 import datetime
 import os
-import traceback
 import bauble.error as error
+from bauble.i18n import _
 
 SQLALCHEMY_DEBUG = False
 
@@ -24,18 +24,14 @@
     raise
 
 
-
-try:
-    import gtk
-except:
-    from bauble.fake_gtk import gtk
+import gtk
 
 import sqlalchemy.orm as orm
 from sqlalchemy.ext.declarative import declarative_base, DeclarativeMeta
 
 import bauble.btypes as types
 import bauble.utils as utils
-from bauble.utils.log import debug, warning
+from bauble.utils.log import warning
 
 
 if SQLALCHEMY_DEBUG:
@@ -59,6 +55,7 @@ def _add(self, operation, mapper, instance):
         Add a new entry to the history table.
         """
         user = None
+        from bauble import db
         try:
             if db.engine.name in ('postgres', 'postgresql'):
                 import bauble.plugins.users as users
@@ -207,7 +204,6 @@ def open(uri, verify=True, show_error_dialogs=False):
     # ** WARNING: this can print your passwd
 ##    debug('db.open(%s)' % uri)
     from sqlalchemy.orm import sessionmaker
-    import bauble
     global engine
     new_engine = None
 
@@ -331,7 +327,6 @@ def verify_connection(engine, show_error_dialogs=False):
     """
 ##    debug('entered verify_connection(%s)' % show_error_dialogs)
     import bauble
-    import bauble.pluginmgr as pluginmgr
     if show_error_dialogs:
         try:
             return verify_connection(engine, False)

bauble/meta.py

@@ -1,12 +1,10 @@
 #
 # meta.py
 #
-from sqlalchemy import *
+from sqlalchemy import Unicode, UnicodeText, Column
 
-import bauble
 import bauble.db as db
 import bauble.utils as utils
-from bauble.utils.log import debug
 
 VERSION_KEY = u'version'
 CREATED_KEY = u'created'

bauble/paths.py

@@ -6,6 +6,7 @@
 """
 import os
 import sys
+from bauble.i18n import _
 
 
 def main_is_frozen():

bauble/pluginmgr.py

@@ -21,13 +21,10 @@
 import sys
 import traceback
 
-try:
-    import gtk
-except:
-    from bauble.fake_gtk import gtk
+import gtk
 
-from sqlalchemy import *
-from sqlalchemy.orm import *
+from bauble.i18n import _
+from sqlalchemy import Column, Unicode, select
 import sqlalchemy.orm.exc as orm_exc
 
 import bauble

bauble/plugins/abcd/__init__.py

@@ -5,10 +5,7 @@
 import os
 import csv
 
-try:
-    import gtk
-except:
-    from bauble.fake_gtk import gtk
+import gtk
 
 from sqlalchemy import *
 from sqlalchemy.orm import *

bauble/plugins/garden/accession.py

@@ -13,11 +13,8 @@
 import weakref
 import xml.sax.saxutils as saxutils
 
-try:
-    import gtk
-    import gobject
-except:
-    from bauble.fake_gtk import gtk, gobject
+import gtk
+import gobject
 
 import lxml.etree as etree
 import pango

bauble/plugins/garden/institution.py

@@ -7,10 +7,7 @@
 
 import os
 
-try:
-    import gtk
-except:
-    from bauble.fake_gtk import gtk
+import gtk
 
 import bauble
 import bauble.editor as editor

bauble/plugins/garden/plant.py

@@ -11,11 +11,8 @@
 import traceback
 from random import random
 
-try:
-    import gtk
-    import gobject
-except:
-    from bauble.fake_gtk import gtk, gobject
+import gtk
+import gobject
 
 import pango
 from sqlalchemy import *

bauble/plugins/garden/propagation.py

@@ -14,10 +14,7 @@
 
 import dateutil.parser as date_parser
 
-try:
-    import gtk
-except:
-    from bauble.fake_gtk import gtk
+import gtk
 
 from sqlalchemy import *
 from sqlalchemy.orm import *

bauble/plugins/garden/source.py

@@ -7,11 +7,8 @@
 import weakref
 from random import random
 
-try:
-    import gtk
-    import gobject
-except:
-    from bauble.fake_gtk import gtk, gobject
+import gtk
+import gobject
 
 from sqlalchemy import *
 from sqlalchemy.orm import *

bauble/plugins/garden/test.py

@@ -3,10 +3,7 @@
 import unittest
 
 
-try:
-    import gtk
-except:
-    from bauble.fake_gtk import gtk
+import gtk
 
 from nose import SkipTest
 from sqlalchemy import *

bauble/plugins/imex/csv_.py

@@ -9,11 +9,8 @@
 import csv
 import traceback
 
-try:
-    import gtk
-    import gobject
-except:
-    from bauble.fake_gtk import gtk, gobject
+import gtk
+import gobject
 
 from sqlalchemy import *
 

bauble/plugins/picasa/__init__.py

@@ -44,11 +44,7 @@ def write(*x): pass
 import gdata.photos.service
 sys.stderr = tmp
 
-try:
-    import gtk
-    import gobject
-except:
-    from bauble.fake_gtk import gtk, gobject
+import gtk
 
 import sqlalchemy as sa
 import sqlalchemy.orm as orm

bauble/plugins/picasa/test.py

@@ -1,10 +1,7 @@
 import os
 from nose import *
 
-try:
-    import gtk
-except:
-    from bauble.fake_gtk import gtk
+import gtk
 
 import bauble.meta as meta
 import bauble.plugins.picasa as picasa

bauble/plugins/plants/family.py

@@ -5,10 +5,7 @@
 import traceback
 import weakref
 
-try:
-    import gtk
-except:
-    from bauble.fake_gtk import gtk
+import gtk
 
 from sqlalchemy import *
 from sqlalchemy.orm import *

bauble/plugins/plants/genus.py

@@ -7,10 +7,7 @@
 import weakref
 import xml
 
-try:
-    import gtk
-except:
-    from bauble.fake_gtk import gtk
+import gtk
 
 from sqlalchemy import *
 from sqlalchemy.orm import *

bauble/plugins/plants/geography.py

@@ -3,18 +3,12 @@
 #
 from operator import itemgetter
 
-try:
-    import gtk
-    import gobject
-except:
-    from bauble.fake_gtk import gtk, gobject
+import gtk
 
 from sqlalchemy import *
 from sqlalchemy.orm import *
 
-import bauble
 import bauble.db as db
-from bauble.utils.log import debug
 
 
 def get_species_in_geography(geo):#, session=None):

bauble/plugins/plants/species_editor.py

@@ -3,16 +3,12 @@
 #
 import os
 import sys
-from operator import itemgetter
 import traceback
 import weakref
 import xml.sax.saxutils as sax
 
-try:
-    import gtk
-    import gobject
-except:
-    from bauble.fake_gtk import gtk, gobject
+import gtk
+import gobject
 
 from sqlalchemy import *
 from sqlalchemy.orm.session import object_session

bauble/plugins/plants/species_model.py

@@ -6,10 +6,7 @@
 import xml.sax.saxutils as sax
 from itertools import chain
 
-try:
-    import gtk
-except:
-    from bauble.fake_gtk import gtk
+import gtk
 
 from sqlalchemy import *
 from sqlalchemy.orm import *

bauble/plugins/report/__init__.py

@@ -9,11 +9,8 @@
 import re
 
 
-try:
-    import gtk
-    import gobject
-except:
-    from bauble.fake_gtk import gtk, gobject
+import gtk
+import gobject
 
 from sqlalchemy import *
 

bauble/plugins/report/mako/__init__.py

@@ -3,10 +3,7 @@
 import sys
 import tempfile
 
-try:
-    import gtk
-except:
-    from bauble.fake_gtk import gtk
+import gtk
 
 from sqlalchemy import *
 from sqlalchemy.orm import *

bauble/plugins/report/xsl/__init__.py

@@ -13,13 +13,8 @@
 import sys
 import os
 import tempfile
-import traceback
 
-try:
-    import gtk
-    import gobject
-except:
-    from bauble.fake_gtk import gtk, gobject
+import gtk
 
 from sqlalchemy import *
 from sqlalchemy.orm import *