[pre-commit.ci] pre-commit autoupdate

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v5.0.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
@@ -15,25 +15,25 @@ repos:
       - id: mixed-line-ending
 
   - repo: https://github.com/psf/black
-    rev: 23.3.0
+    rev: 24.10.0
     hooks:
       - id: black
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.3.1
+    rev: v3.19.0
     hooks:
       - id: pyupgrade
         name: PyUpgrade 3.6+
         args: ["--py36-plus"]
         exclude: ^bin/
 
   - repo: https://github.com/PyCQA/isort
-    rev: 5.12.0
+    rev: 5.13.2
     hooks:
       - id: isort
         args: [--profile, black]
 
   - repo: https://github.com/asottile/setup-cfg-fmt
-    rev: v2.2.0
+    rev: v2.7.0
     hooks:
       - id: setup-cfg-fmt

pupil_src/launchables/eye.py

@@ -8,6 +8,7 @@
 See COPYING and COPYING.LESSER for license details.
 ---------------------------------------------------------------------------~(*)
 """
+
 import os
 import platform
 import signal

pupil_src/launchables/marker_detectors.py

@@ -8,6 +8,7 @@
 See COPYING and COPYING.LESSER for license details.
 ---------------------------------------------------------------------------~(*)
 """
+
 from types import SimpleNamespace
 
 

pupil_src/launchables/player.py

@@ -8,6 +8,7 @@
 See COPYING and COPYING.LESSER for license details.
 ---------------------------------------------------------------------------~(*)
 """
+
 import asyncio
 import os
 import platform
@@ -775,9 +776,9 @@ def handle_notifications(n):
 
         session_settings["loaded_plugins"] = g_pool.plugins.get_initializers()
         session_settings["min_data_confidence"] = g_pool.min_data_confidence
-        session_settings[
-            "min_calibration_confidence"
-        ] = g_pool.min_calibration_confidence
+        session_settings["min_calibration_confidence"] = (
+            g_pool.min_calibration_confidence
+        )
         session_settings["ui_config"] = g_pool.gui.configuration
         session_settings["window_position"] = glfw.get_window_pos(main_window)
         session_settings["version"] = str(g_pool.version)

pupil_src/launchables/service.py

@@ -8,6 +8,7 @@
 See COPYING and COPYING.LESSER for license details.
 ---------------------------------------------------------------------------~(*)
 """
+
 import os
 import signal
 
@@ -297,9 +298,9 @@ def handle_notifications(n):
         session_settings["version"] = str(g_pool.version)
         session_settings["eye0_process_alive"] = eye_procs_alive[0].value
         session_settings["eye1_process_alive"] = eye_procs_alive[1].value
-        session_settings[
-            "min_calibration_confidence"
-        ] = g_pool.min_calibration_confidence
+        session_settings["min_calibration_confidence"] = (
+            g_pool.min_calibration_confidence
+        )
         session_settings["audio_mode"] = audio.get_audio_mode()
         session_settings.close()
 

pupil_src/launchables/world.py

@@ -8,6 +8,7 @@
 See COPYING and COPYING.LESSER for license details.
 ---------------------------------------------------------------------------~(*)
 """
+
 import os
 import platform
 import signal
@@ -809,9 +810,9 @@ def window_should_update():
         session_settings["version"] = str(g_pool.version)
         session_settings["eye0_process_alive"] = eye_procs_alive[0].value
         session_settings["eye1_process_alive"] = eye_procs_alive[1].value
-        session_settings[
-            "min_calibration_confidence"
-        ] = g_pool.min_calibration_confidence
+        session_settings["min_calibration_confidence"] = (
+            g_pool.min_calibration_confidence
+        )
         session_settings["pupil_detection_enabled"] = g_pool.pupil_detection_enabled
         session_settings["audio_mode"] = audio.get_audio_mode()
 

pupil_src/shared_modules/accuracy_visualizer.py

@@ -8,6 +8,7 @@
 See COPYING and COPYING.LESSER for license details.
 ---------------------------------------------------------------------------~(*)
 """
+
 import logging
 import traceback
 import typing as T
@@ -273,10 +274,12 @@ def ignore(_):
                 self,
                 "Angular Accuracy",
                 setter=ignore,
-                getter=lambda: f"{self.accuracy.result:.3f} deg. Samples used: "
-                f"{self.accuracy.num_used} / {self.accuracy.num_total}"
-                if self.accuracy is not None
-                else "Not available",
+                getter=lambda: (
+                    f"{self.accuracy.result:.3f} deg. Samples used: "
+                    f"{self.accuracy.num_used} / {self.accuracy.num_total}"
+                    if self.accuracy is not None
+                    else "Not available"
+                ),
             )
         )
         self.menu.append(ui.Info_Text(precision_help))
@@ -286,10 +289,12 @@ def ignore(_):
                 self,
                 "Angular Precision",
                 setter=ignore,
-                getter=lambda: f"{self.precision.result:.3f} deg. Samples used: "
-                f"{self.precision.num_used} / {self.precision.num_total}"
-                if self.precision is not None
-                else "Not available",
+                getter=lambda: (
+                    f"{self.precision.result:.3f} deg. Samples used: "
+                    f"{self.precision.num_used} / {self.precision.num_total}"
+                    if self.precision is not None
+                    else "Not available"
+                ),
             )
         )
 

pupil_src/shared_modules/annotations.py

@@ -8,6 +8,7 @@
 See COPYING and COPYING.LESSER for license details.
 ---------------------------------------------------------------------------~(*)
 """
+
 import abc
 import csv
 import json

pupil_src/shared_modules/audio/__init__.py

@@ -8,6 +8,7 @@
 See COPYING and COPYING.LESSER for license details.
 ---------------------------------------------------------------------------~(*)
 """
+
 import logging
 import platform
 import subprocess as sp

pupil_src/shared_modules/audio_playback.py

@@ -8,6 +8,7 @@
 See COPYING and COPYING.LESSER for license details.
 ---------------------------------------------------------------------------~(*)
 """
+
 import collections
 import itertools
 import logging

pupil_src/shared_modules/audio_utils.py

@@ -8,6 +8,7 @@
 See COPYING and COPYING.LESSER for license details.
 ---------------------------------------------------------------------------~(*)
 """
+
 import collections
 import logging
 import traceback

pupil_src/shared_modules/av_writer.py

@@ -8,6 +8,7 @@
 See COPYING and COPYING.LESSER for license details.
 ---------------------------------------------------------------------------~(*)
 """
+
 import abc
 import collections
 import logging

pupil_src/shared_modules/background_helper.py

@@ -8,6 +8,7 @@
 See COPYING and COPYING.LESSER for license details.
 ---------------------------------------------------------------------------~(*)
 """
+
 import logging
 import multiprocessing as mp
 import signal

pupil_src/shared_modules/blink_detection.py

@@ -8,6 +8,7 @@
 See COPYING and COPYING.LESSER for license details.
 ---------------------------------------------------------------------------~(*)
 """
+
 import csv
 import logging
 import os

pupil_src/shared_modules/calibration_choreography/__init__.py

@@ -8,6 +8,7 @@
 See COPYING and COPYING.LESSER for license details.
 ---------------------------------------------------------------------------~(*)
 """
+
 from .base_plugin import (
     CalibrationChoreographyPlugin,
     ChoreographyAction,

pupil_src/shared_modules/calibration_choreography/base_plugin.py

@@ -8,6 +8,7 @@
 See COPYING and COPYING.LESSER for license details.
 ---------------------------------------------------------------------------~(*)
 """
+
 import abc
 import enum
 import functools as F

pupil_src/shared_modules/calibration_choreography/controller/__init__.py

@@ -8,6 +8,7 @@
 See COPYING and COPYING.LESSER for license details.
 ---------------------------------------------------------------------------~(*)
 """
+
 from .gui_monitor import GUIMonitor
 from .gui_window import GUIWindow
 from .marker_window_controller import (

pupil_src/shared_modules/calibration_choreography/controller/gui_monitor.py

@@ -8,6 +8,7 @@
 See COPYING and COPYING.LESSER for license details.
 ---------------------------------------------------------------------------~(*)
 """
+
 import collections
 import typing as T
 

pupil_src/shared_modules/calibration_choreography/controller/gui_window.py

@@ -8,6 +8,7 @@
 See COPYING and COPYING.LESSER for license details.
 ---------------------------------------------------------------------------~(*)
 """
+
 import collections
 import contextlib
 import platform

pupil_src/shared_modules/calibration_choreography/controller/marker_window_controller.py

@@ -8,6 +8,7 @@
 See COPYING and COPYING.LESSER for license details.
 ---------------------------------------------------------------------------~(*)
 """
+
 import abc
 import functools
 import logging

pupil_src/shared_modules/calibration_choreography/hmd_plugin.py

@@ -8,6 +8,7 @@
 See COPYING and COPYING.LESSER for license details.
 ---------------------------------------------------------------------------~(*)
 """
+
 import abc
 import logging
 import os

pupil_src/shared_modules/calibration_choreography/mixin/__init__.py

@@ -8,4 +8,5 @@
 See COPYING and COPYING.LESSER for license details.
 ---------------------------------------------------------------------------~(*)
 """
+
 from .monitor_selection_mixin import MonitorSelectionMixin

pupil_src/shared_modules/calibration_choreography/mixin/monitor_selection_mixin.py

@@ -8,6 +8,7 @@
 See COPYING and COPYING.LESSER for license details.
 ---------------------------------------------------------------------------~(*)
 """
+
 import logging
 import typing as T
 

pupil_src/shared_modules/calibration_choreography/natural_feature_plugin.py

@@ -8,6 +8,7 @@
 See COPYING and COPYING.LESSER for license details.
 ---------------------------------------------------------------------------~(*)
 """
+
 import logging
 import os
 import typing as T

pupil_src/shared_modules/calibration_choreography/screen_marker_plugin.py

@@ -8,6 +8,7 @@
 See COPYING and COPYING.LESSER for license details.
 ---------------------------------------------------------------------------~(*)
 """
+
 import logging
 import typing as T
 

pupil_src/shared_modules/calibration_choreography/single_marker_plugin.py

@@ -8,6 +8,7 @@
 See COPYING and COPYING.LESSER for license details.
 ---------------------------------------------------------------------------~(*)
 """
+
 import enum
 import logging
 import typing as T

pupil_src/shared_modules/camera_intrinsics_estimation.py

@@ -8,6 +8,7 @@
 See COPYING and COPYING.LESSER for license details.
 ---------------------------------------------------------------------------~(*)
 """
+
 import cv2
 import gl_utils
 import glfw

pupil_src/shared_modules/camera_models.py

@@ -8,6 +8,7 @@
 See COPYING and COPYING.LESSER for license details.
 ---------------------------------------------------------------------------~(*)
 """
+
 import abc
 import ast
 import logging
@@ -350,17 +351,15 @@ def focal_length(self) -> float:
         return (fx + fy) / 2
 
     @abc.abstractmethod
-    def undistort(self, img: npt.NDArray[np.uint8]) -> npt.NDArray[np.uint8]:
-        ...
+    def undistort(self, img: npt.NDArray[np.uint8]) -> npt.NDArray[np.uint8]: ...
 
     @abc.abstractmethod
     def unprojectPoints(
         self,
         pts_2d: npt.NDArray[np.float64],
         use_distortion: bool = True,
         normalize: bool = False,
-    ) -> npt.NDArray[np.float64]:
-        ...
+    ) -> npt.NDArray[np.float64]: ...
 
     @abc.abstractmethod
     def projectPoints(
@@ -369,14 +368,12 @@ def projectPoints(
         rvec: T.Optional[npt.NDArray[np.float64]] = None,
         tvec: T.Optional[npt.NDArray[np.float64]] = None,
         use_distortion: bool = True,
-    ):
-        ...
+    ): ...
 
     @abc.abstractmethod
     def undistort_points_to_ideal_point_coordinates(
         self, points: npt.NDArray[np.float64]
-    ) -> npt.NDArray[np.float64]:
-        ...
+    ) -> npt.NDArray[np.float64]: ...
 
     def undistort_points_on_image_plane(
         self, points: npt.NDArray[np.float64]
@@ -401,8 +398,7 @@ def solvePnP(
         useExtrinsicGuess: bool = False,
         rvec: T.Optional[np.ndarray] = None,
         tvec: T.Optional[np.ndarray] = None,
-    ):
-        ...
+    ): ...
 
     subclass_by_cam_type: T.Dict[str, T.Type["Camera_Model"]] = dict()
 

pupil_src/shared_modules/csv_utils.py

@@ -8,6 +8,7 @@
 See COPYING and COPYING.LESSER for license details.
 ---------------------------------------------------------------------------~(*)
 """
+
 import abc
 import csv
 import os

pupil_src/shared_modules/cv2_writer.py

@@ -8,6 +8,7 @@
 See COPYING and COPYING.LESSER for license details.
 ---------------------------------------------------------------------------~(*)
 """
+
 from cv2 import VideoWriter
 
 

pupil_src/shared_modules/data_changed.py

@@ -8,6 +8,7 @@
 See COPYING and COPYING.LESSER for license details.
 ---------------------------------------------------------------------------~(*)
 """
+
 """
 Contains classes to announce available data between different plugins. Data (e.g.
 pupil positions or gaze) is produced by some plugins and consumed by others. Data