Merge pull request #10 from mh105/psychopy_main_test

Fix using this package as a plugin through entry-points to PsychoPy
psychopy · Jul 1, 2024 · a0505a1 · a0505a1
2 parents 7853885 + b97ba4d
commit a0505a1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/psychopy_eyetracker_sr_research/sr_research/eyelink/default_eyetracker.yaml b/psychopy_eyetracker_sr_research/sr_research/eyelink/default_eyetracker.yaml
@@ -5,7 +5,7 @@
 # created by the ioHub Process will be assigned the default value
 # indicated here.
 #
-eyetracker.sr_research.eyelink.EyeTracker:
+eyetracker.eyelink.EyeTracker:
     # name: The unique name to assign to the device instance created.
     #   The device is accessed from within the PsychoPy script 
     #   using the name's value; therefore it must be a valid Python

diff --git a/psychopy_eyetracker_sr_research/sr_research/eyelink/eyetracker.py b/psychopy_eyetracker_sr_research/sr_research/eyelink/eyetracker.py
@@ -202,7 +202,7 @@ def __init__(self, *args, **kwargs):
                         psychopy_file_name = None
                         for dev in self._iohub_server.devices:
                             if dev.__class__.__name__ == 'Experiment':
-                                psychopy_file_name = dev.getConfiguration()['filename']
+                                psychopy_file_name = dev.getConfiguration().get('filename')
                         if psychopy_file_name:
                             # make sure local_file_name is relative to _local_edf_dir
                             EyeTracker._local_edf_dir = os.path.commonprefix([self._local_edf_dir, psychopy_file_name])

diff --git a/psychopy_eyetracker_sr_research/sr_research/eyelink/supported_config_settings.yaml b/psychopy_eyetracker_sr_research/sr_research/eyelink/supported_config_settings.yaml
@@ -1,4 +1,4 @@
-eyetracker.hw.sr_research.eyelink.EyeTracker:
+eyetracker.eyelink.EyeTracker:
     name: tracker
     enable: IOHUB_BOOL
     save_events: IOHUB_BOOL

diff --git a/pyproject.toml b/pyproject.toml
@@ -47,10 +47,11 @@ tests = [
 ]
 
 [tool.setuptools.packages.find]
-where = ["", "psychopy_eyetracker_sr_research",]
+where = [""]
+include = ["psychopy_eyetracker_sr_research*"]
 
 [project.entry-points."psychopy.iohub.devices.eyetracker"]
-eyelink = "psychopy_eyetracker_eyelogic.sr_research.eyelink"
+eyelink = "psychopy_eyetracker_sr_research.sr_research.eyelink"
 
 [tool.setuptools.package-data]
 "*" = ["*.yaml"]