Merge branch 'master' into add_gradcam

ultralytics · May 6, 2023 · 5307867 · 5307867
2 parents d48d339 + c3e4e94
commit 5307867
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -22,7 +22,7 @@ repos:
       - id: detect-private-key
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.3.1
+    rev: v3.3.2
     hooks:
       - id: pyupgrade
         name: Upgrade code
@@ -35,7 +35,7 @@ repos:
         name: Sort imports
 
   - repo: https://github.com/google/yapf
-    rev: v0.32.0
+    rev: v0.33.0
     hooks:
       - id: yapf
         name: YAPF formatting

diff --git a/models/common.py b/models/common.py
@@ -353,8 +353,9 @@ def __init__(self, weights='yolov5s.pt', device=torch.device('cpu'), dnn=False,
             model.half() if fp16 else model.float()
             if extra_files['config.txt']:  # load metadata dict
                 d = json.loads(extra_files['config.txt'],
-                               object_hook=lambda d: {int(k) if k.isdigit() else k: v
-                                                      for k, v in d.items()})
+                               object_hook=lambda d: {
+                                   int(k) if k.isdigit() else k: v
+                                   for k, v in d.items()})
                 stride, names = int(d['stride']), d['names']
         elif dnn:  # ONNX OpenCV DNN
             LOGGER.info(f'Loading {w} for ONNX OpenCV DNN inference...')

diff --git a/utils/google_app_engine/additional_requirements.txt b/utils/google_app_engine/additional_requirements.txt
@@ -1,5 +1,5 @@
 # add these requirements in your app on top of the existing ones
 pip==21.1
-Flask==1.0.2
+Flask==2.3.2
 gunicorn==19.10.0
 werkzeug>=2.2.3 # not directly required, pinned by Snyk to avoid a vulnerability