From d6e0f89d5454a7329da7a64359123657410c1ed0 Mon Sep 17 00:00:00 2001 From: suelynnmah Date: Wed, 1 May 2024 12:50:02 +0100 Subject: [PATCH 1/3] ENH: capitalise C in cedrus --- psychopy_cedrus/components/cedrusBox/__init__.py | 2 +- pyproject.toml | 2 +- tests/test_builder/test_ExampleComponent.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/psychopy_cedrus/components/cedrusBox/__init__.py b/psychopy_cedrus/components/cedrusBox/__init__.py index 28cbc1c..d9c7151 100644 --- a/psychopy_cedrus/components/cedrusBox/__init__.py +++ b/psychopy_cedrus/components/cedrusBox/__init__.py @@ -13,7 +13,7 @@ __author__ = 'Jon Peirce' -class cedrusButtonBoxComponent(KeyboardComponent): +class CedrusButtonBoxComponent(KeyboardComponent): """An event class for checking an Cedrus RBxxx button boxes using XID library diff --git a/pyproject.toml b/pyproject.toml index 736c407..0a3f043 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -48,7 +48,7 @@ where = ["",] "*" = ["*.png",] [project.entry-points."psychopy.experiment.components"] -cedrusButtonBoxComponent = "psychopy_cedrus.components.cedrusBox:cedrusButtonBoxComponent" +CedrusButtonBoxComponent = "psychopy_cedrus.components.cedrusBox:cedrusButtonBoxComponent" RipondaButtonBoxBackend = "psychopy_cedrus.components.riponda:RipondaButtonBoxBackend" [project.entry-points."psychopy.hardware.cedrus"] diff --git a/tests/test_builder/test_ExampleComponent.py b/tests/test_builder/test_ExampleComponent.py index 8cdbef7..0a96a6c 100644 --- a/tests/test_builder/test_ExampleComponent.py +++ b/tests/test_builder/test_ExampleComponent.py @@ -1,5 +1,5 @@ from psychopy_cedrus.components.cedrusBox import cedrusButtonBoxComponent from psychopy.tests.test_experiment.test_components.test_base_components import BaseComponentTests -class TestcedrusButtonBoxComponent(BaseComponentTests): - comp = cedrusButtonBoxComponent +class TestCedrusButtonBoxComponent(BaseComponentTests): + comp = CedrusButtonBoxComponent From 6a818219af7813dd75cdc4fedbd675d1ad00feaf Mon Sep 17 00:00:00 2001 From: Todd Parsons Date: Wed, 1 May 2024 16:49:03 +0100 Subject: [PATCH 2/3] FF: Capitalise C in test suite import --- tests/test_builder/test_ExampleComponent.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_builder/test_ExampleComponent.py b/tests/test_builder/test_ExampleComponent.py index 0a96a6c..a73783b 100644 --- a/tests/test_builder/test_ExampleComponent.py +++ b/tests/test_builder/test_ExampleComponent.py @@ -1,4 +1,4 @@ -from psychopy_cedrus.components.cedrusBox import cedrusButtonBoxComponent +from psychopy_cedrus.components.cedrusBox import CedrusButtonBoxComponent from psychopy.tests.test_experiment.test_components.test_base_components import BaseComponentTests class TestCedrusButtonBoxComponent(BaseComponentTests): From 7c75ffb9fd8023b5df225d99722b0a518fb268fc Mon Sep 17 00:00:00 2001 From: Todd Parsons Date: Wed, 1 May 2024 17:50:56 +0100 Subject: [PATCH 3/3] FF: Use correct name in CedrusButtonBoxComponent component --- psychopy_cedrus/components/cedrusBox/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/psychopy_cedrus/components/cedrusBox/__init__.py b/psychopy_cedrus/components/cedrusBox/__init__.py index d9c7151..1d48b4e 100644 --- a/psychopy_cedrus/components/cedrusBox/__init__.py +++ b/psychopy_cedrus/components/cedrusBox/__init__.py @@ -40,7 +40,7 @@ def __init__(self, exp, parentName, name='buttonBox', startType='time (s)', startVal=0.0, stopType='duration (s)', stopVal=1.0, startEstim='', durationEstim='',): - super(cedrusButtonBoxComponent, self).__init__( + super(CedrusButtonBoxComponent, self).__init__( exp, parentName, name=name, allowedKeys=allowedKeys, store=store, discardPrev=discardPrev, forceEndRoutine=forceEndRoutine, storeCorrect=storeCorrect,