forked from openlp/openlp
Fix some pylint failures and add qtawesome to appveyor install.
bzr-revno: 2828
This commit is contained in:
commit
5e3c3f55d2
@ -1,5 +1,5 @@
|
||||
# -*- coding: {'icon': utf-8 -*-
|
||||
# vim: {'icon': autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
|
||||
# -*- coding: utf-8 -*-
|
||||
# vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
|
||||
|
||||
###############################################################################
|
||||
# OpenLP - Open Source Lyrics Projection #
|
||||
@ -157,7 +157,6 @@ class UiIcons(object):
|
||||
'video': {'icon': 'fa.file-video-o'},
|
||||
'volunteer': {'icon': 'fa.group'}
|
||||
}
|
||||
|
||||
self.load_icons(self, icon_list)
|
||||
|
||||
def load_icons(self, icon_list):
|
||||
@ -174,11 +173,10 @@ class UiIcons(object):
|
||||
setattr(self, key, qta.icon(icon))
|
||||
except Exception:
|
||||
import sys
|
||||
log.error("Unexpected error:", sys.exc_info())
|
||||
log.error("Unexpected error: %s" % sys.exc_info())
|
||||
setattr(self, key, qta.icon('fa.plus-circle', color='red'))
|
||||
except:
|
||||
setattr(self, key, qta.icon('fa.plus-circle', color='red'))
|
||||
|
||||
self.main_icon = build_icon(':/icon/openlp-logo.svg')
|
||||
|
||||
@staticmethod
|
||||
|
@ -11,7 +11,7 @@ environment:
|
||||
|
||||
install:
|
||||
# Install dependencies from pypi
|
||||
- "%PYTHON%\\python.exe -m pip install sqlalchemy alembic chardet beautifulsoup4 Mako nose mock pyodbc==4.0.8 psycopg2 pypiwin32==219 pyenchant websockets asyncio waitress six webob requests"
|
||||
- "%PYTHON%\\python.exe -m pip install sqlalchemy alembic chardet beautifulsoup4 Mako nose mock pyodbc==4.0.8 psycopg2 pypiwin32==219 pyenchant websockets asyncio waitress six webob requests QtAwesome"
|
||||
# Install mysql dependency
|
||||
- "%PYTHON%\\python.exe -m pip install http://cdn.mysql.com/Downloads/Connector-Python/mysql-connector-python-2.0.4.zip#md5=3df394d89300db95163f17c843ef49df"
|
||||
# Download and install lxml and pyicu (originally from http://www.lfd.uci.edu/~gohlke/pythonlibs/)
|
||||
|
@ -36,7 +36,8 @@ from openlp.core.common import is_win
|
||||
|
||||
TOLERATED_ERRORS = {'registryproperties.py': ['access-member-before-definition'],
|
||||
'opensong.py': ['no-name-in-module'],
|
||||
'maindisplay.py': ['no-name-in-module']}
|
||||
'maindisplay.py': ['no-name-in-module'],
|
||||
'icons.py': ['too-many-function-args']}
|
||||
|
||||
|
||||
class TestPylint(TestCase):
|
||||
|
Loading…
Reference in New Issue
Block a user