Merge pull request #8 from TEParsons/main-rf-new-struct

RF: Reconfigure project to be detected by ioHub
psychopy · Sep 2, 2024 · dd6d95f · dd6d95f
2 parents 13dd980 + b6304ab
commit dd6d95f
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 14 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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"