From 1da59bef0d745ed740cb5d0491fd2f964e751bf7 Mon Sep 17 00:00:00 2001 From: Benjamin Hoving Date: Wed, 18 Sep 2019 16:44:39 +0000 Subject: [PATCH] Create a linting stage --- .gitlab-ci.yml | 14 +++++++++++ .../songusage/forms/auditdetaildialog.py | 6 ++--- .../songusage/forms/auditdetailform.py | 23 +++++++++---------- setup.py | 18 +++++++-------- 4 files changed, 37 insertions(+), 24 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 335545919..efcfce3c1 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -1,6 +1,20 @@ stages: + - lint - test +lint: + stage: lint + image: python + before_script: + - apt-get update + # packages required for dbus-python + - apt-get -y install libdbus-1-dev libdbus-glib-1-dev + # packages required for pyodbc + - apt-get -y install unixodbc unixodbc-dev + - pip install -e .[test] + script: + - flake8 + test-debian: stage: test variables: diff --git a/openlp/plugins/songusage/forms/auditdetaildialog.py b/openlp/plugins/songusage/forms/auditdetaildialog.py index a17181bc5..0a4ff5196 100644 --- a/openlp/plugins/songusage/forms/auditdetaildialog.py +++ b/openlp/plugins/songusage/forms/auditdetaildialog.py @@ -9,14 +9,14 @@ from PyQt4 import QtCore, QtGui + class Ui_AuditDetailDialog(object): def setupUi(self, AuditDetailDialog): AuditDetailDialog.setObjectName(u'AuditDetailDialog') AuditDetailDialog.resize(593, 501) self.buttonBox = QtGui.QDialogButtonBox(AuditDetailDialog) self.buttonBox.setGeometry(QtCore.QRect(420, 470, 170, 25)) - self.buttonBox.setStandardButtons( - QtGui.QDialogButtonBox.Cancel|QtGui.QDialogButtonBox.Ok) + self.buttonBox.setStandardButtons(QtGui.QDialogButtonBox.Cancel | QtGui.QDialogButtonBox.Ok) self.buttonBox.setObjectName(u'buttonBox') self.FileGroupBox = QtGui.QGroupBox(AuditDetailDialog) self.FileGroupBox.setGeometry(QtCore.QRect(10, 370, 571, 70)) @@ -31,7 +31,7 @@ class Ui_AuditDetailDialog(object): self.SaveFilePushButton = QtGui.QPushButton(self.FileGroupBox) icon = QtGui.QIcon() icon.addPixmap(QtGui.QPixmap(u':/exports/export_load.png'), - QtGui.QIcon.Normal, QtGui.QIcon.Off) + QtGui.QIcon.Normal, QtGui.QIcon.Off) self.SaveFilePushButton.setIcon(icon) self.SaveFilePushButton.setObjectName(u'SaveFilePushButton') self.horizontalLayout.addWidget(self.SaveFilePushButton) diff --git a/openlp/plugins/songusage/forms/auditdetailform.py b/openlp/plugins/songusage/forms/auditdetailform.py index 275de3229..eea300172 100644 --- a/openlp/plugins/songusage/forms/auditdetailform.py +++ b/openlp/plugins/songusage/forms/auditdetailform.py @@ -26,6 +26,7 @@ from PyQt4 import QtCore, QtGui from auditdetaildialog import Ui_AuditDetailDialog + class AuditDetailForm(QtGui.QDialog, Ui_AuditDetailDialog): """ Class documentation goes here. @@ -68,10 +69,8 @@ class AuditDetailForm(QtGui.QDialog, Ui_AuditDetailDialog): self.resetWindow() def defineOutputLocation(self): - path = QtGui.QFileDialog.getExistingDirectory(self, - self.trUtf8(u'Output File Location'), - self.parent.config.get_last_dir(1) ) - path = unicode(path) + path = QtGui.QFileDialog.getExistingDirectory(self, self.trUtf8(u'Output File Location'), + self.parent.config.get_last_dir(1)) if path != u'': self.parent.config.set_last_dir(path, 1) self.FileLineEdit.setText(path) @@ -97,10 +96,10 @@ class AuditDetailForm(QtGui.QDialog, Ui_AuditDetailDialog): self.ThirdToTimeEdit.setEnabled(True) def accept(self): - print self.DetailedReport.isChecked() - print self.SummaryReport.isChecked() - print self.FromDateEdit.date() - print self.ToDateEdit.date() + print(self.DetailedReport.isChecked()) + print(self.SummaryReport.isChecked()) + print(self.FromDateEdit.date()) + print(self.ToDateEdit.date()) if self.DetailedReport.isChecked(): self.detailedReport() else: @@ -108,15 +107,15 @@ class AuditDetailForm(QtGui.QDialog, Ui_AuditDetailDialog): self.close() def detailedReport(self): - print "detailed" + print("detailed") filename = u'audit_det_%s_%s.txt' % \ (self.FromDateEdit.date().toString(u'ddMMyyyy'), self.ToDateEdit.date().toString(u'ddMMyyyy')) - print filename + print(filename) def summaryReport(self): - print "summary" + print("summary") filename = u'audit_sum_%s_%s.txt' % \ (self.FromDateEdit.date().toString(u'ddMMyyyy'), self.ToDateEdit.date().toString(u'ddMMyyyy')) - print filename + print(filename) diff --git a/setup.py b/setup.py index 51caf0fe3..bdad5b727 100644 --- a/setup.py +++ b/setup.py @@ -197,16 +197,16 @@ using a computer and a data projector.""", 'sword-bibles': ['pysword'], # Required for scripts/*.py: 'jenkins': ['python-jenkins'], - 'launchpad': ['launchpadlib'] + 'launchpad': ['launchpadlib'], + 'test': [ + 'PyMuPDF', + 'pyodbc', + 'pysword', + 'pytest', + 'python-xlib; platform_system=="Linux"', + 'flake8', + ] }, - tests_require=[ - 'pylint', - 'PyMuPDF', - 'pyodbc', - 'pysword', - 'pytest', - 'python-xlib; platform_system=="Linux"' - ], setup_requires=['pytest-runner'], entry_points={'gui_scripts': ['openlp = openlp.__main__:start']} )