Merge branch 'cy/pre-release-fixes-2.0' into cy/upgrade-gentl-backend

Author: C-Achard

.pre-commit-config.yaml

@@ -1,16 +1,25 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.4.0
+    rev: v6.0.0
     hooks:
       - id: check-added-large-files
       - id: check-yaml
+      - id: check-toml
       - id: end-of-file-fixer
       - id: name-tests-test
         args: [--pytest-test-first]
       - id: trailing-whitespace
       - id: check-merge-conflict
+  - repo: https://github.com/tox-dev/pyproject-fmt
+    rev: v2.15.2
+    hooks:
+      - id: pyproject-fmt
+  - repo: https://github.com/abravalheri/validate-pyproject
+    rev: v0.25
+    hooks:
+      - id: validate-pyproject
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.14.10
+    rev: v0.15.0
     hooks:
       # Run the formatter.
       - id: ruff-format

dlclivegui/processors/dlc_processor_socket.py

@@ -40,8 +40,7 @@ def register_processor(cls):
     return cls
 
 
-# pragma: no cover
-class OneEuroFilter:
+class OneEuroFilter:  # pragma: no cover
     def __init__(self, t0, x0, dx0=None, min_cutoff=1.0, beta=0.0, d_cutoff=1.0):
         self.min_cutoff = min_cutoff
         self.beta = beta
@@ -81,8 +80,6 @@ def __call__(self, t, x):
 
 
 # pragma: cover
-
-
 class BaseProcessorSocket(Processor):
     """
     Base processor class that implements a socket server to help remote control recording in experiments.
@@ -492,7 +489,7 @@ def get_data(self):
 
 
 @register_processor
-class ExampleProcessorSocketCalculateMousePose(BaseProcessorSocket):
+class ExampleProcessorSocketCalculateMousePose(BaseProcessorSocket):  # pragma: no cover
     """
     DLC Processor with pose calculations (center, heading, head angle) and optional filtering.
 
@@ -663,7 +660,7 @@ def get_data(self):
 
 
 @register_processor
-class ExampleProcessorSocketFilterKeypoints(BaseProcessorSocket):
+class ExampleProcessorSocketFilterKeypoints(BaseProcessorSocket):  # pragma: no cover
     PROCESSOR_NAME = "Mouse Pose with less keypoints"
     PROCESSOR_DESCRIPTION = "Calculates mouse center, heading, and head angle with optional One-Euro filtering"
     PROCESSOR_PARAMS = {

pyproject.toml

@@ -1,54 +1,54 @@
 [build-system]
-requires = ["setuptools>=68.0"]
 build-backend = "setuptools.build_meta"
+requires = [ "setuptools>=68" ]
 
 [project]
 name = "deeplabcut-live-gui"
-dynamic = ["version"]
 description = "PySide6-based GUI to run real time DeepLabCut experiments"
 readme = "README.md"
-requires-python = ">=3.10"
-license-files = ["LICENSE"]
-authors = [
-    {name = "A. & M. Mathis Labs", email = "adim@deeplabcut.org"}
-]
-keywords = ["deeplabcut", "pose estimation", "real-time", "gui", "deep learning"]
+keywords = [ "deep learning", "deeplabcut", "gui", "pose estimation", "real-time" ]
+license-files = [ "LICENSE" ]
+authors = [ { name = "A. & M. Mathis Labs", email = "adim@deeplabcut.org" } ]
+requires-python = ">=3.10,<3.13"
 classifiers = [
-    "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.10",
-    "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: 3.12",
-    "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
-    "Operating System :: OS Independent",
-    "Development Status :: 4 - Beta",
-    "Intended Audience :: Science/Research",
-    "Topic :: Scientific/Engineering :: Artificial Intelligence",
-    "Framework :: Qt",
-    "Environment :: X11 Applications :: Qt",
+  "Development Status :: 4 - Beta",
+  "Environment :: X11 Applications :: Qt",
+  "Intended Audience :: Science/Research",
+  "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",
+  "Operating System :: OS Independent",
+  "Programming Language :: Python :: 3 :: Only",
+  "Programming Language :: Python :: 3.10",
+  "Programming Language :: Python :: 3.11",
+  "Programming Language :: Python :: 3.12",
+  "Topic :: Scientific/Engineering :: Artificial Intelligence",
 ]
-
+dynamic = [ "version" ]
 dependencies = [
-    "deeplabcut-live>=2.0.0", # might be missing timm and scipy
-    "PySide6",
-    "qdarkstyle",
-    "numpy",
-    "opencv-python",
-    "cv2-enumerate-cameras",
-    "pydantic>=2.0",
-    "vidgear[core]",
-    "matplotlib",
+  "cv2-enumerate-cameras",
+  "deeplabcut-live>=2",    # might be missing timm and scipy
+  "matplotlib",
+  "numpy",
+  "opencv-python",
+  "pydantic>=2",
+  "pyside6",
+  "qdarkstyle",
+  "vidgear[core]",
 ]
-
-[project.optional-dependencies]
-basler = ["pypylon"]
-gentl = ["harvesters"]
-all = ["pypylon", "harvesters"]
-pytorch = [
-    "deeplabcut-live[pytorch]>=2.0.0", # this includes timm and scipy
+optional-dependencies.all = [ "harvesters", "pypylon" ]
+optional-dependencies.basler = [ "pypylon" ]
+optional-dependencies.dev = [
+  "hypothesis>=6",
+  "pre-commit",
+  "pytest>=7",
+  "pytest-cov>=4",
+  "pytest-mock>=3.10",
+  "pytest-qt>=4.2",
 ]
-tf = [
-    "deeplabcut-live[tf]>=2.0.0",
+optional-dependencies.gentl = [ "harvesters" ]
+optional-dependencies.pytorch = [
+  "deeplabcut-live[pytorch]>=2", # this includes timm and scipy
 ]
+<<<<<<< cy/upgrade-gentl-backend
 dev = [
     "pytest>=7.0",
     "pytest-cov>=4.0",
@@ -65,44 +65,62 @@ test = [
     "pytest-qt>=4.2",
     "pytest-timeout>=2.0",
     "hypothesis>=6.0",
+=======
+optional-dependencies.test = [
+  "hypothesis>=6",
+  "pytest>=7",
+  "pytest-cov>=4",
+  "pytest-mock>=3.10",
+  "pytest-qt>=4.2",
 ]
+optional-dependencies.tf = [
+  "deeplabcut-live[tf]>=2",
+>>>>>>> cy/pre-release-fixes-2.0
+]
+urls."Bug Tracker" = "https://github.com/DeepLabCut/DeepLabCut-live-GUI/issues"
+urls.Documentation = "https://github.com/DeepLabCut/DeepLabCut-live-GUI"
+urls.Homepage = "https://github.com/DeepLabCut/DeepLabCut-live-GUI"
+urls.Repository = "https://github.com/DeepLabCut/DeepLabCut-live-GUI"
+scripts.dlclivegui = "dlclivegui:main"
 
-[project.urls]
-Homepage = "https://github.com/DeepLabCut/DeepLabCut-live-GUI"
-Repository = "https://github.com/DeepLabCut/DeepLabCut-live-GUI"
-Documentation = "https://github.com/DeepLabCut/DeepLabCut-live-GUI"
-"Bug Tracker" = "https://github.com/DeepLabCut/DeepLabCut-live-GUI/issues"
-
-[project.scripts]
-dlclivegui = "dlclivegui:main"
-
+[tool.setuptools]
 # [tool.setuptools]
+
 # include-package-data = true
 
 # This is more granular and explicit than include-package-data,
+
 # which can be too broad and include unwanted files.
-[tool.setuptools.package-data]
-"dlclivegui.assets" = ["*.png"]
 
+package-data."dlclivegui.assets" = [ "*.png" ]
+packages.find.where = [ "." ]
+packages.find.include = [ "dlclivegui*" ]
+packages.find.exclude = [ "tests*", "docs*" ]
 
-[tool.setuptools.packages.find]
-where = ["."]
-include = ["dlclivegui*"]
-exclude = ["tests*", "docs*"]
+[tool.ruff]
+target-version = "py310"
+line-length = 120
+fix = true
+lint.select = [ "B", "E", "F", "I", "UP" ]
+lint.ignore = [ "E741" ]
+
+[tool.pyproject-fmt]
+generate-python-classifiers = false
 
-[tool.pytest.ini_options]
-testpaths = ["tests"]
-python_files = ["test_*.py"]
-python_classes = ["Test*"]
-python_functions = ["test_*"]
-addopts = [
-    "--strict-markers",
-    "--strict-config",
-    "--disable-warnings",
-    # "--maxfail=1",
-    "-ra",
-    "-q",
+[tool.pytest]
+ini_options.testpaths = [ "tests" ]
+ini_options.python_files = [ "test_*.py" ]
+ini_options.python_classes = [ "Test*" ]
+ini_options.python_functions = [ "test_*" ]
+ini_options.addopts = [
+  "--strict-markers",
+  "--strict-config",
+  "--disable-warnings",
+  # "--maxfail=1",
+  "-ra",
+  "-q",
 ]
+<<<<<<< cy/upgrade-gentl-backend
 markers = [
     "unit: Unit tests for individual components",
     "integration: Integration tests for component interaction",
@@ -111,33 +129,33 @@ markers = [
     # "slow: Tests that take a long time to run",
     "gui: Tests that require GUI interaction",
     "timeout: Test timeout in seconds (pytest-timeout)",
+=======
+ini_options.markers = [
+  "unit: Unit tests for individual components",
+  "integration: Integration tests for component interaction",
+  "functional: Functional tests for end-to-end workflows",
+  "hardware: Tests that require specific hardware, notable camera backends",
+  # "slow: Tests that take a long time to run",
+  "gui: Tests that require GUI interaction",
+>>>>>>> cy/pre-release-fixes-2.0
 ]
 
-[tool.coverage.run]
-source = ["dlclivegui"]
-omit = [
-    "*/tests/*",
-    "*/__pycache__/*",
-    "*/site-packages/*",
+[tool.coverage]
+run.branch = true
+run.omit = [
+  "*/__pycache__/*",
+  "*/site-packages/*",
 ]
-
-[tool.coverage.report]
-exclude_lines = [
-    "pragma: no cover",
-    "def __repr__",
-    "raise AssertionError",
-    "raise NotImplementedError",
-    "if __name__ == .__main__.:",
-    "if TYPE_CHECKING:",
-    "@abstract",
+run.source = [ "dlclivegui", "tests" ]
+report.exclude_lines = [
+  "@abstract",
+  "def __repr__",
+  "if __name__ == .__main__.:",
+  "if TYPE_CHECKING:",
+  "pragma: no cover",
+  "raise AssertionError",
+  "raise NotImplementedError",
+]
+report.omit = [
+  "tests/*",
 ]
-
-[tool.ruff]
-lint.select = ["E", "F", "B", "I", "UP"]
-lint.ignore = ["E741"]
-target-version = "py310"
-fix = true
-line-length = 120
-
-[tool.ruff.lint.pydocstyle]
-convention = "google"