From 461262372f61f85d5c884a454f679fb08d119ecc Mon Sep 17 00:00:00 2001 From: Luke Yeager Date: Thu, 20 Oct 2016 17:26:32 -0700 Subject: [PATCH] Fix python lint under plugins/ --- digits-lint | 5 ++++- .../digitsDataPluginImageGradients/__init__.py | 2 ++ .../digitsDataPluginImageGradients/data.py | 1 + plugins/data/imageGradients/setup.py | 5 +++-- .../digitsDataPluginSunnybrook/__init__.py | 2 ++ .../sunnybrook/digitsDataPluginSunnybrook/data.py | 14 ++++++++------ .../sunnybrook/digitsDataPluginSunnybrook/forms.py | 4 +--- plugins/data/sunnybrook/setup.py | 5 +++-- .../digitsViewPluginImageGradients/__init__.py | 2 ++ .../digitsViewPluginImageGradients/forms.py | 1 + .../digitsViewPluginImageGradients/view.py | 4 ++-- plugins/view/imageGradients/setup.py | 5 +++-- setup.cfg | 2 +- 13 files changed, 33 insertions(+), 19 deletions(-) diff --git a/digits-lint b/digits-lint index 076fe2910..73978d850 100755 --- a/digits-lint +++ b/digits-lint @@ -2,10 +2,13 @@ # Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. set -e -set -x + +echo "Checking for lint ..." if which flake8 >/dev/null 2>&1; then python2 `which flake8` . else python2 -m flake8 . fi + +echo "No lint found." diff --git a/plugins/data/imageGradients/digitsDataPluginImageGradients/__init__.py b/plugins/data/imageGradients/digitsDataPluginImageGradients/__init__.py index 2ed387aad..f2513023e 100644 --- a/plugins/data/imageGradients/digitsDataPluginImageGradients/__init__.py +++ b/plugins/data/imageGradients/digitsDataPluginImageGradients/__init__.py @@ -2,3 +2,5 @@ from __future__ import absolute_import from .data import DataIngestion + +__all__ = [DataIngestion] diff --git a/plugins/data/imageGradients/digitsDataPluginImageGradients/data.py b/plugins/data/imageGradients/digitsDataPluginImageGradients/data.py index 2d8f2a73e..c9babdddb 100644 --- a/plugins/data/imageGradients/digitsDataPluginImageGradients/data.py +++ b/plugins/data/imageGradients/digitsDataPluginImageGradients/data.py @@ -11,6 +11,7 @@ TEMPLATE = "templates/template.html" INFERENCE_TEMPLATE = "templates/inference_template.html" + @subclass class DataIngestion(DataIngestionInterface): """ diff --git a/plugins/data/imageGradients/setup.py b/plugins/data/imageGradients/setup.py index 61457305d..1899cf608 100644 --- a/plugins/data/imageGradients/setup.py +++ b/plugins/data/imageGradients/setup.py @@ -21,7 +21,8 @@ def read(fname): packages=find_packages(), entry_points={ DIGITS_PLUGIN_GROUP: [ - 'class=digitsDataPluginImageGradients:DataIngestion', - ]}, + 'class=digitsDataPluginImageGradients:DataIngestion', + ] + }, include_package_data=True, ) diff --git a/plugins/data/sunnybrook/digitsDataPluginSunnybrook/__init__.py b/plugins/data/sunnybrook/digitsDataPluginSunnybrook/__init__.py index 2ed387aad..f2513023e 100644 --- a/plugins/data/sunnybrook/digitsDataPluginSunnybrook/__init__.py +++ b/plugins/data/sunnybrook/digitsDataPluginSunnybrook/__init__.py @@ -2,3 +2,5 @@ from __future__ import absolute_import from .data import DataIngestion + +__all__ = [DataIngestion] diff --git a/plugins/data/sunnybrook/digitsDataPluginSunnybrook/data.py b/plugins/data/sunnybrook/digitsDataPluginSunnybrook/data.py index ffafde753..523e984b3 100644 --- a/plugins/data/sunnybrook/digitsDataPluginSunnybrook/data.py +++ b/plugins/data/sunnybrook/digitsDataPluginSunnybrook/data.py @@ -1,7 +1,6 @@ # Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved. from __future__ import absolute_import -import csv import cv2 import fnmatch import math @@ -47,8 +46,10 @@ # Utility functions # + def shrink_case(case): toks = case.split("-") + def shrink_if_number(x): try: cvt = int(x) @@ -73,9 +74,11 @@ def __str__(self): def get_all_contours(contour_path): # walk the directory structure for all the contour files - contours = [os.path.join(dirpath, f) + contours = [ + os.path.join(dirpath, f) for dirpath, dirnames, files in os.walk(contour_path) - for f in fnmatch.filter(files, 'IM-0001-*-icontour-manual.txt')] + for f in fnmatch.filter(files, 'IM-0001-*-icontour-manual.txt') + ] extracted = map(Contour, contours) return extracted @@ -94,6 +97,7 @@ def load_contour(contour, img_path): # Main class # + @subclass class DataIngestion(DataIngestionInterface): """ @@ -123,7 +127,6 @@ def __init__(self, is_inference_db=False, **kwargs): palette = [0, 0, 0, 255, 255, 255] + [0] * (254 * 3) self.userdata[COLOR_PALETTE_ATTRIBUTE] = palette - @override def encode_entry(self, entry): img, label = load_contour(entry, self.image_folder) @@ -131,8 +134,7 @@ def encode_entry(self, entry): if self.userdata['channel_conversion'] == 'L': feature = img[np.newaxis, ...] elif self.userdata['channel_conversion'] == 'RGB': - feature = np.empty(shape=(3, img.shape[0], img.shape[1]), - dtype=img.dtype) + feature = np.empty(shape=(3, img.shape[0], img.shape[1]), dtype=img.dtype) # just copy the same data over the three color channels feature[0] = img feature[1] = img diff --git a/plugins/data/sunnybrook/digitsDataPluginSunnybrook/forms.py b/plugins/data/sunnybrook/digitsDataPluginSunnybrook/forms.py index bfb5dded4..a1c1af0cc 100644 --- a/plugins/data/sunnybrook/digitsDataPluginSunnybrook/forms.py +++ b/plugins/data/sunnybrook/digitsDataPluginSunnybrook/forms.py @@ -6,8 +6,7 @@ from digits import utils from digits.utils import subclass from flask.ext.wtf import Form -import wtforms -from wtforms import HiddenField, validators +from wtforms import validators @subclass @@ -98,4 +97,3 @@ def validate_file_path(form, field): default='none', tooltip="Test a record from the validation set." ) - diff --git a/plugins/data/sunnybrook/setup.py b/plugins/data/sunnybrook/setup.py index 95b494451..c1049bf5c 100644 --- a/plugins/data/sunnybrook/setup.py +++ b/plugins/data/sunnybrook/setup.py @@ -21,8 +21,9 @@ def read(fname): packages=find_packages(), entry_points={ DIGITS_PLUGIN_GROUP: [ - 'class=digitsDataPluginSunnybrook:DataIngestion', - ]}, + 'class=digitsDataPluginSunnybrook:DataIngestion', + ] + }, include_package_data=True, install_requires=['pydicom'], ) diff --git a/plugins/view/imageGradients/digitsViewPluginImageGradients/__init__.py b/plugins/view/imageGradients/digitsViewPluginImageGradients/__init__.py index c0b2b8cf3..ac8fea749 100644 --- a/plugins/view/imageGradients/digitsViewPluginImageGradients/__init__.py +++ b/plugins/view/imageGradients/digitsViewPluginImageGradients/__init__.py @@ -2,3 +2,5 @@ from __future__ import absolute_import from .view import Visualization + +__all__ = [Visualization] diff --git a/plugins/view/imageGradients/digitsViewPluginImageGradients/forms.py b/plugins/view/imageGradients/digitsViewPluginImageGradients/forms.py index 15769e9b1..0f8b3c06a 100644 --- a/plugins/view/imageGradients/digitsViewPluginImageGradients/forms.py +++ b/plugins/view/imageGradients/digitsViewPluginImageGradients/forms.py @@ -7,6 +7,7 @@ import wtforms from wtforms import validators + @subclass class ConfigForm(Form): """ diff --git a/plugins/view/imageGradients/digitsViewPluginImageGradients/view.py b/plugins/view/imageGradients/digitsViewPluginImageGradients/view.py index 2ce7f1960..744b10fd8 100644 --- a/plugins/view/imageGradients/digitsViewPluginImageGradients/view.py +++ b/plugins/view/imageGradients/digitsViewPluginImageGradients/view.py @@ -100,8 +100,8 @@ def process_data(self, input_id, input_data, output_data): # assume only one output and grayscale input output_vector = output_data[output_data.keys()[0]] - grad = np.array( - [output_vector[0] * self.width, + grad = np.array([ + output_vector[0] * self.width, output_vector[1] * self.height]) grad_rotated_90 = np.array([-grad[1], grad[0]]) center = np.array([self.width / 2, self.height / 2]) diff --git a/plugins/view/imageGradients/setup.py b/plugins/view/imageGradients/setup.py index e5ce40c67..c693fec5a 100644 --- a/plugins/view/imageGradients/setup.py +++ b/plugins/view/imageGradients/setup.py @@ -21,7 +21,8 @@ def read(fname): packages=find_packages(), entry_points={ DIGITS_PLUGIN_GROUP: [ - 'class=digitsViewPluginImageGradients:Visualization', - ]}, + 'class=digitsViewPluginImageGradients:Visualization', + ] + }, include_package_data=True, ) diff --git a/setup.cfg b/setup.cfg index 2a6883098..2cff1950f 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,3 +1,3 @@ [flake8] max-line-length = 120 -exclude = venv/,digits/,plugins/ +exclude = venv/,digits/