Skip to content

Commit 0636df1

Browse files
committed
Fix and add flake8.
1 parent deea30a commit 0636df1

File tree

6 files changed

+16
-26
lines changed

6 files changed

+16
-26
lines changed

.travis.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,15 @@ virtualenv:
1818
install:
1919
- sudo apt-get install -y git pylint pep8 python3-pyqt5
2020
- pip install nose nose-exclude nosexcover pyflakes
21+
- pip install --upgrade flake8
2122

2223
before_script:
2324
- echo "Build starting on " `date`
2425
- export PYTHONPATH=`pwd`
2526

2627
script:
2728
- xvfb-run --server-args="-screen 0, 1024x768x24" nosetests -v --with-id --with-xcoverage --with-xunit --verbose --cover-package=.
28-
- make pep8
29+
- make flake8
2930

3031
after_success:
3132
- pip install coveralls

Makefile

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
PROJECT_NAME = PARAMETERS
22
BUILD_DIRECTORY = ../build_$(PROJECT_NAME)
33

4-
# Run pep8 style checking
5-
#http://pypi.python.org/pypi/pep8
6-
pep8:
4+
# Run flake8 style checking
5+
flake8:
76
@echo
87
@echo "-----------"
9-
@echo "PEP8 issues"
8+
@echo "Flake8 issues"
109
@echo "-----------"
11-
@pep8 --repeat --ignore=E203,E121,E122,E123,E124,E125,E126,E127,E128,E402 . || true
10+
@python3 -m flake8 --version
11+
@python3 -m flake8 || true
1212

1313
# Run entire test suite
1414
test_suite:

parameters/qt_widgets/group_parameter_widget.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,8 @@ def __init__(self, parameter, parent=None):
5050
self.main_layout.addLayout(self._group_layout)
5151

5252
# Why are we doing imports here? TS
53-
from parameters.qt_widgets.parameter_container import ParameterContainer
53+
from parameters.qt_widgets.parameter_container import (
54+
ParameterContainer)
5455

5556
self.param_container = ParameterContainer(
5657
parameters=self._parameter.value)

parameters/qt_widgets/parameter_container.py

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
QFrame,
1212
QHBoxLayout
1313
)
14-
from PyQt5.QtGui import QColor
1514

1615
from parameters.parameter_exceptions import InvalidValidationException
1716
from parameters.qt_widgets.qt5_parameter_factory import Qt5ParameterFactory
@@ -190,21 +189,9 @@ def setup_ui(self, must_scroll=True):
190189
self.qt5_parameter_factory.register_widget(
191190
extra_parameter[0], extra_parameter[1])
192191

193-
color_odd = QColor(220, 220, 220)
194-
color_even = QColor(192, 192, 192)
195-
196-
i = 0
197192
for parameter in parameters:
198193
parameter_widget = self.qt5_parameter_factory.get_widget(parameter)
199-
if i % 2:
200-
color = color_even
201-
else:
202-
color = color_odd
203-
i += 1
204194
parameter_widget.setAutoFillBackground(True)
205-
# palette = parameter_widget.palette()
206-
# palette.setColor(parameter_widget.backgroundRole(), color)
207-
# parameter_widget.setPalette(palette)
208195
self.vertical_layout.addWidget(parameter_widget)
209196

210197
self.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)

parameters/qt_widgets/test/main.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44
import sys
55
from functools import partial
66

7-
from PyQt5.QtWidgets import QApplication, QWidget, QGridLayout, QPushButton, QMessageBox
7+
from PyQt5.QtWidgets import (
8+
QApplication, QWidget, QGridLayout, QPushButton, QMessageBox)
89

910
from parameters.boolean_parameter import BooleanParameter
1011
from parameters.dict_parameter import DictParameter
@@ -54,11 +55,11 @@ def validate_min_max(parent_container):
5455

5556
if min_value > max_value:
5657
print('Not valid')
58+
message = ('Your minimum value (%d) should be less than your '
59+
'maximum value (%d)' % (min_value, max_value))
5760
return {
5861
'valid': False,
59-
'message': (
60-
'Your minimum value (%d) should be less than your maximum '
61-
'value (%d)' % (min_value, max_value))
62+
'message': message
6263
}
6364
print('Valid')
6465
return {'valid': True, 'message': ''}

parameters/unit.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,8 +180,8 @@ def serialize(self):
180180
'plural': self.plural,
181181
'abbreviation': self.abbreviation,
182182
'help_text': self.help_text,
183-
'description': self.description,
184-
}
183+
'description': self.description
184+
}
185185

186186
def __str__(self):
187187
return self.name

0 commit comments

Comments
 (0)