From b6304ab7d56320254df5059042d328d5418cc5f1 Mon Sep 17 00:00:00 2001
From: TEParsons <todd.e.parsons@gmail.com>
Date: Fri, 30 Aug 2024 14:38:18 +0100
Subject: [PATCH] RF: Reconfigure project to be detected by ioHub

---
 .../pupil_labs/neon/__init__.py                           | 4 ++--
 .../pupil_labs/neon/default_eyetracker.yaml               | 2 +-
 .../pupil_labs/neon/eyetracker.py                         | 2 +-
 .../pupil_labs/pupil_core/__init__.py                     | 4 ++--
 .../pupil_labs/pupil_core/default_eyetracker.yaml         | 2 +-
 .../pupil_labs/pupil_core/eyetracker.py                   | 2 +-
 pyproject.toml                                            | 8 ++------
 7 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/psychopy_eyetracker_pupil_labs/pupil_labs/neon/__init__.py b/psychopy_eyetracker_pupil_labs/pupil_labs/neon/__init__.py
index 1471c97..873c175 100644
--- a/psychopy_eyetracker_pupil_labs/pupil_labs/neon/__init__.py
+++ b/psychopy_eyetracker_pupil_labs/pupil_labs/neon/__init__.py
@@ -4,6 +4,6 @@
 # Distributed under the terms of the GNU General Public License (GPL).
 
 from psychopy.iohub.devices.eyetracker.eye_events import BinocularEyeSampleEvent
-from .eyetracker import NeonEyeTracker
+from .eyetracker import EyeTracker
 
-__all__ = ["NeonEyeTracker", "BinocularEyeSampleEvent"]
+__all__ = ["EyeTracker", "BinocularEyeSampleEvent"]
diff --git a/psychopy_eyetracker_pupil_labs/pupil_labs/neon/default_eyetracker.yaml b/psychopy_eyetracker_pupil_labs/pupil_labs/neon/default_eyetracker.yaml
index a78d0fd..002b9cb 100644
--- a/psychopy_eyetracker_pupil_labs/pupil_labs/neon/default_eyetracker.yaml
+++ b/psychopy_eyetracker_pupil_labs/pupil_labs/neon/default_eyetracker.yaml
@@ -1,4 +1,4 @@
-eyetracker.hw.pupil_labs.neon.EyeTracker:
+eyetracker.neon.EyeTracker:
     # Indicates if the device should actually be loaded at experiment runtime.
     enable: True
 
diff --git a/psychopy_eyetracker_pupil_labs/pupil_labs/neon/eyetracker.py b/psychopy_eyetracker_pupil_labs/pupil_labs/neon/eyetracker.py
index 822e6a3..bc6a534 100644
--- a/psychopy_eyetracker_pupil_labs/pupil_labs/neon/eyetracker.py
+++ b/psychopy_eyetracker_pupil_labs/pupil_labs/neon/eyetracker.py
@@ -18,7 +18,7 @@
 logger = logging.getLogger(__name__)
 
 
-class NeonEyeTracker(EyeTrackerDevice):
+class EyeTracker(EyeTrackerDevice):
     """
     Implementation of the :py:class:`Common Eye Tracker Interface <.EyeTrackerDevice>`
     for the Pupil Core headset.
diff --git a/psychopy_eyetracker_pupil_labs/pupil_labs/pupil_core/__init__.py b/psychopy_eyetracker_pupil_labs/pupil_labs/pupil_core/__init__.py
index b250a6f..80d043d 100644
--- a/psychopy_eyetracker_pupil_labs/pupil_labs/pupil_core/__init__.py
+++ b/psychopy_eyetracker_pupil_labs/pupil_labs/pupil_core/__init__.py
@@ -6,6 +6,6 @@
     MonocularEyeSampleEvent,
     BinocularEyeSampleEvent,
 )
-from .eyetracker import PupilCoreEyeTracker
+from .eyetracker import EyeTracker
 
-__all__ = ["PupilCoreEyeTracker", "MonocularEyeSampleEvent", "BinocularEyeSampleEvent"]
+__all__ = ["EyeTracker", "MonocularEyeSampleEvent", "BinocularEyeSampleEvent"]
diff --git a/psychopy_eyetracker_pupil_labs/pupil_labs/pupil_core/default_eyetracker.yaml b/psychopy_eyetracker_pupil_labs/pupil_labs/pupil_core/default_eyetracker.yaml
index 000cd8a..4a2413f 100644
--- a/psychopy_eyetracker_pupil_labs/pupil_labs/pupil_core/default_eyetracker.yaml
+++ b/psychopy_eyetracker_pupil_labs/pupil_labs/pupil_core/default_eyetracker.yaml
@@ -1,4 +1,4 @@
-eyetracker.hw.pupil_labs.pupil_core.EyeTracker:
+eyetracker.pupil_core.EyeTracker:
     # Indicates if the device should actually be loaded at experiment runtime.
     enable: True
 
diff --git a/psychopy_eyetracker_pupil_labs/pupil_labs/pupil_core/eyetracker.py b/psychopy_eyetracker_pupil_labs/pupil_labs/pupil_core/eyetracker.py
index 1a2498f..0a4e223 100644
--- a/psychopy_eyetracker_pupil_labs/pupil_labs/pupil_core/eyetracker.py
+++ b/psychopy_eyetracker_pupil_labs/pupil_labs/pupil_core/eyetracker.py
@@ -23,7 +23,7 @@
 logger = logging.getLogger(__name__)
 
 
-class PupilCoreEyeTracker(EyeTrackerDevice):
+class EyeTracker(EyeTrackerDevice):
     """
     Implementation of the :py:class:`Common Eye Tracker Interface <.EyeTrackerDevice>`
     for the Pupil Core headset.
diff --git a/pyproject.toml b/pyproject.toml
index 4ba078a..787f854 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -54,13 +54,9 @@ where = ["", "psychopy_eyetracker_pupil_labs",]
 [tool.setuptools.package-data]
 "*" = ["*.yaml", "*.png"]
 
-[project.entry-points."psychopy.iohub.devices"]
-NeonEyeTracker = "psychopy_eyetracker_pupil_labs.pupil_labs.neon.eyetracker:NeonEyeTracker"
-PupilCoreEyeTracker = "psychopy_eyetracker_pupil_labs.pupil_labs.pupil_core.eyetracker:PupilCoreEyeTracker"
-
 [project.entry-points."psychopy.iohub.devices.eyetracker"]
-NeonEyeTracker = "psychopy_eyetracker_pupil_labs.pupil_labs.neon.eyetracker:NeonEyeTracker"
-PupilCoreEyeTracker = "psychopy_eyetracker_pupil_labs.pupil_labs.pupil_core.eyetracker:PupilCoreEyeTracker"
+neon = "psychopy_eyetracker_pupil_labs.pupil_labs.neon"
+pupil_core = "psychopy_eyetracker_pupil_labs.pupil_labs.pupil_core"
 
 [project.entry-points."psychopy.experiment.components"]
 AprilTagComponent = "psychopy_eyetracker_pupil_labs:AprilTagComponent"