Explorar el Código

Enable "I" in ruff.toml

Kentaro Wada hace 1 año
padre
commit
d1b8a22adc

+ 1 - 0
examples/bbox_detection/labelme2voc.py

@@ -9,6 +9,7 @@ import os.path as osp
 import sys
 
 import imgviz
+
 import labelme
 
 try:

+ 0 - 1
examples/tutorial/load_label_png.py

@@ -7,7 +7,6 @@ import os.path as osp
 import numpy as np
 import PIL.Image
 
-
 here = osp.dirname(osp.abspath(__file__))
 
 

+ 1 - 1
labelme/__main__.py

@@ -4,8 +4,8 @@ import logging
 import os
 import os.path as osp
 import sys
-import yaml
 
+import yaml
 from qtpy import QtCore
 from qtpy import QtWidgets
 

+ 0 - 1
labelme/ai/efficient_sam.py

@@ -7,7 +7,6 @@ import onnxruntime
 import skimage
 
 from ..logger import logger
-
 from . import _utils
 
 

+ 0 - 1
labelme/ai/segment_anything_model.py

@@ -7,7 +7,6 @@ import onnxruntime
 import skimage
 
 from ..logger import logger
-
 from . import _utils
 
 

+ 4 - 4
labelme/app.py

@@ -11,14 +11,12 @@ import webbrowser
 import imgviz
 import natsort
 from qtpy import QtCore
-from qtpy.QtCore import Qt
 from qtpy import QtGui
 from qtpy import QtWidgets
+from qtpy.QtCore import Qt
 
-from labelme import __appname__
 from labelme import PY2
-
-from . import utils
+from labelme import __appname__
 from labelme.ai import MODELS
 from labelme.config import get_config
 from labelme.label_file import LabelFile
@@ -35,6 +33,8 @@ from labelme.widgets import ToolBar
 from labelme.widgets import UniqueLabelQListWidget
 from labelme.widgets import ZoomWidget
 
+from . import utils
+
 # FIXME
 # - [medium] Set max zoom value to something big enough for FitWidth/Window
 

+ 1 - 2
labelme/cli/draw_json.py

@@ -6,9 +6,8 @@ import sys
 import imgviz
 import matplotlib.pyplot as plt
 
-from labelme.label_file import LabelFile
 from labelme import utils
-
+from labelme.label_file import LabelFile
 
 PY2 = sys.version_info[0] == 2
 

+ 1 - 1
labelme/cli/export_json.py

@@ -7,8 +7,8 @@ import os.path as osp
 import imgviz
 import PIL.Image
 
-from labelme.logger import logger
 from labelme import utils
+from labelme.logger import logger
 
 
 def main():

+ 1 - 1
labelme/cli/json_to_dataset.py

@@ -7,8 +7,8 @@ import os.path as osp
 import imgviz
 import PIL.Image
 
-from labelme.logger import logger
 from labelme import utils
+from labelme.logger import logger
 
 
 def main():

+ 0 - 1
labelme/config/__init__.py

@@ -5,7 +5,6 @@ import yaml
 
 from labelme.logger import logger
 
-
 here = osp.dirname(osp.abspath(__file__))
 
 

+ 2 - 3
labelme/label_file.py

@@ -6,12 +6,11 @@ import os.path as osp
 
 import PIL.Image
 
-from labelme import __version__
-from labelme.logger import logger
 from labelme import PY2
 from labelme import QT4
+from labelme import __version__
 from labelme import utils
-
+from labelme.logger import logger
 
 PIL.Image.MAX_IMAGE_PIXELS = None
 

+ 0 - 1
labelme/logger.py

@@ -12,7 +12,6 @@ if os.name == "nt":  # Windows
 
 from . import __appname__
 
-
 COLORS = {
     "WARNING": "yellow",
     "INFO": "white",

+ 2 - 3
labelme/shape.py

@@ -2,13 +2,12 @@ import copy
 import math
 
 import numpy as np
+import skimage.measure
 from qtpy import QtCore
 from qtpy import QtGui
-import skimage.measure
 
-from labelme.logger import logger
 import labelme.utils
-
+from labelme.logger import logger
 
 # TODO(unknown):
 # - [opt] Store paths instead of creating new ones at each paint.

+ 1 - 0
labelme/testing.py

@@ -2,6 +2,7 @@ import json
 import os.path as osp
 
 import imgviz
+
 import labelme.utils
 
 

+ 1 - 3
labelme/utils/qt.py

@@ -1,13 +1,11 @@
-from math import sqrt
 import os.path as osp
+from math import sqrt
 
 import numpy as np
-
 from qtpy import QtCore
 from qtpy import QtGui
 from qtpy import QtWidgets
 
-
 here = osp.dirname(osp.abspath(__file__))
 
 

+ 1 - 1
labelme/widgets/brightness_contrast_dialog.py

@@ -1,8 +1,8 @@
 import PIL.Image
 import PIL.ImageEnhance
-from qtpy.QtCore import Qt
 from qtpy import QtGui
 from qtpy import QtWidgets
+from qtpy.QtCore import Qt
 
 from .. import utils
 

+ 2 - 3
labelme/widgets/canvas.py

@@ -4,11 +4,10 @@ from qtpy import QtGui
 from qtpy import QtWidgets
 
 import labelme.ai
-from labelme.logger import logger
+import labelme.utils
 from labelme import QT5
+from labelme.logger import logger
 from labelme.shape import Shape
-import labelme.utils
-
 
 # TODO(unknown):
 # - [maybe] Find optimal epsilon value.

+ 1 - 1
labelme/widgets/escapable_qlist_widget.py

@@ -1,5 +1,5 @@
-from qtpy.QtCore import Qt
 from qtpy import QtWidgets
+from qtpy.QtCore import Qt
 
 
 class EscapableQListWidget(QtWidgets.QListWidget):

+ 2 - 2
labelme/widgets/file_dialog_preview.py

@@ -1,9 +1,9 @@
+import json
+
 from qtpy import QtCore
 from qtpy import QtGui
 from qtpy import QtWidgets
 
-import json
-
 
 class ScrollAreaPreview(QtWidgets.QScrollArea):
     def __init__(self, *args, **kwargs):

+ 1 - 2
labelme/widgets/label_dialog.py

@@ -5,9 +5,8 @@ from qtpy import QtCore
 from qtpy import QtGui
 from qtpy import QtWidgets
 
-from labelme.logger import logger
 import labelme.utils
-
+from labelme.logger import logger
 
 QT5 = QT_VERSION[0] == "5"
 

+ 2 - 2
labelme/widgets/label_list_widget.py

@@ -1,8 +1,8 @@
 from qtpy import QtCore
-from qtpy.QtCore import Qt
 from qtpy import QtGui
-from qtpy.QtGui import QPalette
 from qtpy import QtWidgets
+from qtpy.QtCore import Qt
+from qtpy.QtGui import QPalette
 from qtpy.QtWidgets import QStyle
 
 

+ 1 - 1
labelme/widgets/unique_label_qlist_widget.py

@@ -2,8 +2,8 @@
 
 import html
 
-from qtpy.QtCore import Qt
 from qtpy import QtWidgets
+from qtpy.QtCore import Qt
 
 from .escapable_qlist_widget import EscapableQListWidget
 

+ 4 - 1
ruff.toml

@@ -11,7 +11,7 @@ indent-width = 4
 # Enable Pyflakes (`F`) and a subset of the pycodestyle (`E`)  codes by default.
 # Unlike Flake8, Ruff doesn't enable pycodestyle warnings (`W`) or
 # McCabe complexity (`C901`) by default.
-select = ["E"]
+select = ["E", "I"]
 ignore = []
 
 # Allow fix for all enabled rules (when `--fix`) is provided.
@@ -30,3 +30,6 @@ skip-magic-trailing-comma = false
 
 # Like Black, automatically detect the appropriate line ending.
 line-ending = "auto"
+
+[isort]
+force-single-line = true

+ 0 - 1
tests/labelme_tests/test_app.py

@@ -8,7 +8,6 @@ import labelme.app
 import labelme.config
 import labelme.testing
 
-
 here = osp.dirname(osp.abspath(__file__))
 data_dir = osp.join(here, "data")
 

+ 2 - 2
tests/labelme_tests/utils_tests/test_shape.py

@@ -1,7 +1,7 @@
-from .util import get_img_and_data
-
 from labelme.utils import shape as shape_module
 
+from .util import get_img_and_data
+
 
 def test_shapes_to_label():
     img, data = get_img_and_data()

+ 0 - 1
tests/labelme_tests/utils_tests/util.py

@@ -4,7 +4,6 @@ import os.path as osp
 from labelme.utils import image as image_module
 from labelme.utils import shape as shape_module
 
-
 here = osp.dirname(osp.abspath(__file__))
 data_dir = osp.join(here, "../data")