raoul/openlp
1
0
Fork 0
forked from openlp/openlp
Code Issues Pull Requests Projects Releases Wiki Activity

Fix some pylint failures and add qtawesome to appveyor install.

Browse Source 
bzr-revno: 2828
This commit is contained in:
Tomas Groth 2018-08-05 22:42:05 +02:00
commit 5e3c3f55d2
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
openlp/core/ui/icons.py
View File

@ -1,5 +1,5 @@
# -*- coding: {'icon': utf-8 -*- # -*- coding: utf-8 -*-
# vim: {'icon': autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4 # vim: autoindent shiftwidth=4 expandtab textwidth=120 tabstop=4 softtabstop=4
############################################################################### ###############################################################################
# OpenLP - Open Source Lyrics Projection # # OpenLP - Open Source Lyrics Projection #
@ -157,7 +157,6 @@ class UiIcons(object):
'video': {'icon': 'fa.file-video-o'}, 'video': {'icon': 'fa.file-video-o'},
'volunteer': {'icon': 'fa.group'} 'volunteer': {'icon': 'fa.group'}
} }
self.load_icons(self, icon_list) self.load_icons(self, icon_list)
def load_icons(self, icon_list): def load_icons(self, icon_list):
@ -174,11 +173,10 @@ class UiIcons(object):
setattr(self, key, qta.icon(icon)) setattr(self, key, qta.icon(icon))
except Exception: except Exception:
import sys 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')) setattr(self, key, qta.icon('fa.plus-circle', color='red'))
except: except:
setattr(self, key, qta.icon('fa.plus-circle', color='red')) setattr(self, key, qta.icon('fa.plus-circle', color='red'))
self.main_icon = build_icon(':/icon/openlp-logo.svg') self.main_icon = build_icon(':/icon/openlp-logo.svg')
@staticmethod @staticmethod

2
scripts/appveyor.yml
View File

@ -11,7 +11,7 @@ environment:
install: install:
# Install dependencies from pypi # 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 # 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" - "%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/) # Download and install lxml and pyicu (originally from http://www.lfd.uci.edu/~gohlke/pythonlibs/)

3
tests/utils/test_pylint.py
View File

@ -36,7 +36,8 @@ from openlp.core.common import is_win
TOLERATED_ERRORS = {'registryproperties.py': ['access-member-before-definition'], TOLERATED_ERRORS = {'registryproperties.py': ['access-member-before-definition'],
'opensong.py': ['no-name-in-module'], '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): class TestPylint(TestCase):