merge friday

Author: dshabin

.devcontainer/devcontainer.json

@@ -1,4 +1,18 @@
 repos:
+  - repo: 'https://github.com/asottile/reorder_python_imports'
+    rev: v2.3.0
+    hooks:
+      - id: reorder-python-imports
+        exclude: src/lib/app/analytics | src/lib/app/converters | src/lib/app/input_converters
+        name: 'Reorder Python imports (src, tests)'
+        args:
+          - '--application-directories'
+          - app
+  - repo: 'https://github.com/python/black'
+    rev: 19.10b0
+    hooks:
+      - id: black
+        name: Code Formatter (black)
   - repo: 'https://gitlab.com/pycqa/flake8'
     rev: 3.8.2
     hooks:
@@ -7,7 +21,7 @@ repos:
         name: Style Guide Enforcement (flake8)
         args:
           - '--max-line-length=120'
-          - --ignore=D100,D203,D405,W503,E203,E501,F841,E126,E712
+          - --ignore=D100,D203,D405,W503,E203,E501,F841,E126,E712,E123,E131,F821,E121
   - repo: 'https://github.com/asottile/pyupgrade'
     rev: v2.4.3
     hooks:
@@ -16,26 +30,12 @@ repos:
         name: Upgrade syntax for newer versions of the language (pyupgrade)
         args:
           - '--py37-plus'
-  - repo: 'https://github.com/asottile/reorder_python_imports'
-    rev: v2.3.0
-    hooks:
-      - id: reorder-python-imports
-        exclude: src/lib/app/analytics | src/lib/app/converters | src/lib/app/input_converters
-        name: 'Reorder Python imports (src, tests)'
-        args:
-          - '--application-directories'
-          - app
   - repo: 'https://github.com/pre-commit/pre-commit-hooks'
     rev: v3.1.0
     hooks:
       - id: check-byte-order-marker
       - id: trailing-whitespace
       - id: end-of-file-fixer
-  - repo: 'https://github.com/python/black'
-    rev: 19.10b0
-    hooks:
-      - id: black
-        name: Uncompromising Code Formatter (black)
 #  - repo: 'https://github.com/asottile/dead'
 #    rev: v1.3.0
 #    hooks:

.pre-commit-config.yaml

@@ -4,4 +4,5 @@ pytest==6.2.4
 pytest-xdist==2.3.0
 pytest-parallel==0.1.0
 pytest-rerunfailures==10.2
-sphinx_rtd_theme==1.0.0
+sphinx_rtd_theme==1.0.0
+

requirements_dev.txt

@@ -412,9 +412,7 @@ def image_consensus(df, image_name, annot_type):
     """
 
     try:
-        from shapely.geometry import box
-        from shapely.geometry import Point
-        from shapely.geometry import Polygon
+        from shapely.geometry import Point, Polygon, box
     except ImportError:
         raise ImportError(
             "To use superannotate.benchmark or superannotate.consensus functions please install "

src/superannotate/lib/app/analytics/common.py

@@ -22,7 +22,6 @@
 from lib.infrastructure.controller import Controller
 from lib.infrastructure.repositories import ConfigRepository
 
-
 controller = Controller.get_instance()