psychopy 2024.1.2__tar.gz → 2024.1.3__tar.gz

{psychopy-2024.1.2 → psychopy-2024.1.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: psychopy
-Version: 2024.1.2
+Version: 2024.1.3
 Summary: PsychoPy provides easy, precise, flexible experiments in behavioural sciences
 Author-Email: Open Science Tools Ltd <support@opensciencetools.org>
 Maintainer-Email: Open Science Tools Ltd <support@opensciencetools.org>
@@ -23,7 +23,7 @@ Requires-Dist: matplotlib
 Requires-Dist: pyglet==1.4.11; platform_system == "Windows"
 Requires-Dist: pyglet==1.5.27; platform_system != "Windows"
 Requires-Dist: pillow>=9.4.0
-Requires-Dist: pyqt5
+Requires-Dist: pyqt6
 Requires-Dist: pandas>=1.5.3
 Requires-Dist: questplus>=2023.1
 Requires-Dist: openpyxl

{psychopy-2024.1.2 → psychopy-2024.1.3}/psychopy/__init__.py

@@ -12,14 +12,14 @@
 import os
 import sys
 
-__version__ = '2024.1.2'
+__version__ = '2024.1.3'
 __license__ = 'GPL v3'
 __author__ = 'Open Science Tools Ltd'
 __author_email__ = 'support@opensciencetools.org'
 __maintainer_email__ = 'support@opensciencetools.org'
 __url__ = 'https://www.psychopy.org/'
 __download_url__ = 'https://github.com/psychopy/psychopy/releases/'
-__git_sha__ = '4e4ac7977'
+__git_sha__ = 'a2e6ccdec'
 __build_platform__ = 'n/a'
 
 __all__ = ["gui", "misc", "visual", "core",

{psychopy-2024.1.2 → psychopy-2024.1.3}/psychopy/experiment/components/mouse/__init__.py

@@ -364,10 +364,22 @@ class MouseComponent(BaseComponent):
             buff.writeIndentedLines(code % self.params)
             buff.setIndentLevel(1, relative=True)
             dedent += 1
+            # keep track of whether something's been written
+            hasContent = False
+            # write code to check clickable stim, if there are any
             if self.params['clickable'].val:
                 self._writeClickableObjectsCode(buff)
+                hasContent = True
+            # write code to check correct stim, if there are any
             if self.params['storeCorrect']:
                 self._writeCorrectAnsCode(buff)
+                hasContent = True
+            # if current if statement has no content, add a pass
+            if not hasContent:
+                buff.writeIndentedLines(
+                    "pass"
+                )
+
             return buff, dedent
 
         # No mouse tracking, end routine on any or valid click

{psychopy-2024.1.2 → psychopy-2024.1.3}/psychopy/experiment/routines/counterbalance/__init__.py

@@ -43,7 +43,7 @@ class CounterbalanceRoutine(BaseStandaloneRoutine):
         self.params['specMode'] = Param(
             specMode, valType="str", inputType="choice", categ="Basic",
             allowedVals=["uniform", "file"],
-            allowedLabels=[_translate("Num. groups"), _translate("Conditions file")],
+            allowedLabels=[_translate("Num. groups"), _translate("Conditions file (local only)")],
             label=_translate("Groups from..."),
             hint=_translate(
                 "Specify groups using an Excel file (for fine tuned control), specify as a variable name, or specify a "

{psychopy-2024.1.2 → psychopy-2024.1.3}/psychopy/hardware/keyboard.py

@@ -573,7 +573,7 @@ class KeyboardDevice(BaseResponseDevice, aliases=["keyboard"]):
             if message.type == "KEYBOARD_PRESS":
                 # if message is from a key down event, make a new response
                 response = KeyPress(code=message.char, tDown=message.time, name=message.key)
-                response.rt = response.tDown
+                response.rt = response.tDown - self.clock.getLastResetTime()
                 self._keysStillDown.append(response)
             else:
                 # if message is from a key up event, alter existing response

psychopy-2024.1.3/psychopy/tests/test_experiment/test_components/__init__.py

@@ -0,0 +1 @@
+from .test_base_components import BaseComponentTests

psychopy-2024.1.2/psychopy/tests/test_experiment/test_components/test_ButtonBox.py → psychopy-2024.1.3/psychopy/tests/test_experiment/test_components/test_ButtonBoxComponent.py

@@ -11,21 +11,14 @@ from psychopy.hardware.button import ButtonResponse
 from psychopy.experiment.routines import Routine
 from psychopy.experiment.components.buttonBox import ButtonBoxComponent
 from psychopy.experiment.components.code import CodeComponent
-from .test_base_components import _TestBaseComponentsMixin
+from psychopy.tests.test_experiment.test_components.test_base_components import BaseComponentTests
+from psychopy.hardware.button import ButtonBox
 
 
-class TestButtonBoxComponent(_TestBaseComponentsMixin):
-    def setup_method(self):
-        self.exp = Experiment()
-        # make blank routine
-        self.routine = Routine(name="testRoutine", exp=self.exp)
-        self.exp.addRoutine("testRoutine", self.routine)
-        self.exp.flow.addRoutine(self.routine, 0)
-        # make component
-        self.comp = ButtonBoxComponent(
-            exp=self.exp, name="testPhotodiodeValidatorRoutine", parentName="testRoutine"
-        )
-
+class TestButtonBoxComponent(BaseComponentTests):
+    comp = ButtonBoxComponent
+    libraryClass = ButtonBox
+    
     def test_values(self):
         """
         Test that a variety of different values work when run from Builder.
@@ -65,9 +58,8 @@ class TestButtonBoxComponent(_TestBaseComponentsMixin):
                 thisCase[keys[i]] = val
             # add case
             cases.append(thisCase)
-
-        # make an experiment
-        exp = Experiment()
+        # make minimal experiment just for this test
+        comp, rt, exp = self.make_minimal_experiment()
         # configure experiment
         exp.requireImport("ButtonResponse", importFrom="psychopy.hardware.button")
         exp.settings.params['Full-screen window'].val = False
@@ -79,18 +71,8 @@ class TestButtonBoxComponent(_TestBaseComponentsMixin):
             resps = case.pop("resps")
             if not isinstance(resps, (list, tuple)):
                 resps = [resps]
-            # make a name
-            name = f"rt{i}"
-            # make a Routine
-            rt = exp.addRoutine(name, Routine(name=name, exp=exp))
-            exp.flow.addRoutine(rt, 0)
             # add timeout
             rt.settings.params['stopVal'].val = 0.2
-            # make a Component
-            comp = ButtonBoxComponent(
-                exp, parentName=name, name=name + "_comp", **case
-            )
-            rt.addComponent(comp)
             # make a Code Component to send responses
             code = (
                 "if frameN > 1:\n"
@@ -104,7 +86,7 @@ class TestButtonBoxComponent(_TestBaseComponentsMixin):
                     name=comp.name, value=resp.value, channel=resp.channel
                 )
             codeComp = CodeComponent(
-                exp, parentName=name + "_code", eachFrame=code
+                exp, parentName=comp.name + "_code", eachFrame=code
             )
             rt.addComponent(codeComp)
         # save exp in temp directory

psychopy-2024.1.2/psychopy/tests/test_experiment/test_components/test_Code.py → psychopy-2024.1.3/psychopy/tests/test_experiment/test_components/test_CodeComponent.py

@@ -2,42 +2,30 @@ from pathlib import Path
 from tempfile import mkdtemp
 
 from psychopy import experiment
-from . import _TestDisabledMixin, _TestBaseComponentsMixin
+from . import BaseComponentTests
 from psychopy.experiment.loops import TrialHandler
 from psychopy.experiment.routines import Routine
 from psychopy.experiment.components.code import CodeComponent
 from psychopy.tests.utils import TESTS_DATA_PATH
 
 
-class TestCodeComponent(_TestBaseComponentsMixin, _TestDisabledMixin):
+class TestCodeComponent(BaseComponentTests):
     """
     Test that Code coponents have the correct params and write as expected.
     """
+    comp = CodeComponent
 
     @classmethod
     def setup_class(cls):
-        cls.exp = experiment.Experiment() # create once, not every test
         try:
             cls.tempDir = mkdtemp(dir=Path(__file__).root, prefix='psychopy-tests-app')
         except (PermissionError, OSError):
             # can't write to root on Linux
             cls.tempDir = mkdtemp(prefix='psychopy-tests-app')
 
-    def setup_method(self):
-        # Make blank experiment
-        self.exp = experiment.Experiment()
-        # Make blank routine
-        self.routine = Routine(name="testRoutine", exp=self.exp)
-        self.exp.addRoutine("testRoutine", self.routine)
-        self.exp.flow.addRoutine(self.routine, 0)
-        # Add loop around routine
-        self.loop = TrialHandler(exp=self.exp, name="testLoop")
-        self.exp.flow.addLoop(self.loop, 0, -1)
-        # Make Mouse component
-        self.comp = CodeComponent(exp=self.exp, parentName="testRoutine", name="testCode")
-        self.routine.addComponent(self.comp)
-
     def test_all_code_component_tabs(self):
+        # make minimal experiment just for this test
+        comp, rt, exp = self.make_minimal_experiment()
         # Names of each tab in a Code component
         tabs = {
             'Before Experiment': '___before_experiment___',
@@ -50,11 +38,11 @@ class TestCodeComponent(_TestBaseComponentsMixin, _TestDisabledMixin):
         # Add markers to component
         for paramName, marker in tabs.items():
             jsParamName = paramName.replace(" ", " JS ")
-            self.comp.params[paramName].val = self.comp.params[jsParamName].val = marker
+            comp.params[paramName].val = comp.params[jsParamName].val = " = ".join([self.comp.__name__, comp.name, marker])
 
         # Write script
-        pyScript = self.exp.writeScript(target="PsychoPy")
-        jsScript = self.exp.writeScript(target="PsychoJS")
+        pyScript = exp.writeScript(target="PsychoPy")
+        jsScript = exp.writeScript(target="PsychoJS")
 
         # Check that code from each tab exists in compiled script
         for lang, script in {"Python": pyScript, "JS": jsScript}.items():

psychopy-2024.1.3/psychopy/tests/test_experiment/test_components/test_GratingComponent.py

@@ -0,0 +1,7 @@
+from psychopy.tests.test_experiment.test_components.test_base_components import BaseComponentTests, _TestLibraryClassMixin
+from psychopy.experiment.components.grating import GratingComponent
+from psychopy.visual import GratingStim
+
+class TestGratingComponent(BaseComponentTests, _TestLibraryClassMixin):
+    comp = GratingComponent
+    libraryClass = GratingStim

psychopy-2024.1.3/psychopy/tests/test_experiment/test_components/test_ImageComponent.py

@@ -0,0 +1,8 @@
+from psychopy.experiment.components.image import ImageComponent
+from psychopy.tests.test_experiment.test_components.test_base_components import BaseComponentTests, _TestDepthMixin, _TestLibraryClassMixin
+from psychopy.visual.image import ImageStim
+
+
+class TestImage(BaseComponentTests, _TestLibraryClassMixin):
+    comp = ImageComponent
+    libraryClass = ImageStim

psychopy-2024.1.2/psychopy/tests/test_experiment/test_components/test_Mouse.py → psychopy-2024.1.3/psychopy/tests/test_experiment/test_components/test_MouseComponent.py

@@ -1,65 +1,52 @@
 from pathlib import Path
 
-from . import _TestDisabledMixin, _TestBaseComponentsMixin
-from psychopy.experiment import Experiment
+from . import BaseComponentTests
 from psychopy.experiment.loops import TrialHandler
-from psychopy.experiment.routines import Routine
 from psychopy.experiment.components.mouse import MouseComponent
 from psychopy.experiment.components.polygon import PolygonComponent
 from psychopy.tests.utils import TESTS_DATA_PATH
 from psychopy.hardware.mouse import Mouse
 
 
-class TestMouseComponent(_TestBaseComponentsMixin, _TestDisabledMixin):
+class TestMouseComponent(BaseComponentTests):
     """
     Test that Mouse coponents have the correct params and write as expected.
     """
+    comp = MouseComponent
     libraryClass = Mouse
 
-    def setup_method(self):
-        # Make blank experiment
-        self.exp = Experiment()
-        # Make blank routine
-        self.routine = Routine(name="testRoutine", exp=self.exp)
-        self.exp.addRoutine("testRoutine", self.routine)
-        self.exp.flow.addRoutine(self.routine, 0)
-        # Add loop around routine
-        self.loop = TrialHandler(exp=self.exp, name="testLoop")
-        self.exp.flow.addLoop(self.loop, 0, -1)
-        # Make Mouse component
-        self.comp = MouseComponent(exp=self.exp, parentName="testRoutine", name="testMouse")
-        self.routine.addComponent(self.comp)
-        # Make a rect for when we need something to click on
-        self.target = PolygonComponent(exp=self.exp, parentName="testRoutine", name="testPolygon")
-        self.routine.addComponent(self.target)
-
     def test_click_save_end_clickable_cases(self):
         """
         Test all combinations of options for what to save, what can be clicked on & what kind of clicks to end the
         routine on.
         """
+        # make minimal experiment just for this test
+        comp, rt, exp = self.make_minimal_experiment()
+        # make a rect for when we need something to click on
+        target = PolygonComponent(exp=exp, parentName=rt.name, name="testPolygon")
+        
         saveMouseStateCases = [
             {'val': "final",
-             'want': ["thisExp.addData('testMouse.x', x)"],  # should contain code for adding final value of x
-             'avoid': ["testMouse.x.append(x)"]},  # should not contain code to update testMouse.x in frame loop
+             'want': [f"thisExp.addData('{comp.name}.x', x)"],  # should contain code for adding final value of x
+             'avoid': [f"{comp.name}.x.append(x)"]},  # should not contain code to update testMouse.x in frame loop
             {'val': "on click",
-             'want': ["thisExp.addData('testMouse.x', testMouse.x)",  # should add testMouse.x at the end
-                      "testMouse.x.append(x)"],  # should contain code to update testMouse.x in frame loop
-             'avoid': ["thisExp.addData('testMouse.x', x)"]},  # should not add final value of x
+             'want': [f"thisExp.addData('{comp.name}.x', {comp.name}.x)",  # should add testMouse.x at the end
+                      f"{comp.name}.x.append(x)"],  # should contain code to update testMouse.x in frame loop
+             'avoid': [f"thisExp.addData('{comp.name}.x', x)"]},  # should not add final value of x
             {'val': "on valid click",
-             'want': ["thisExp.addData('testMouse.x', testMouse.x)",  # should add testMouse.x at the end
-                      "testMouse.x.append(x)",  # should contain code to update testMouse.x in frame loop
+             'want': [f"thisExp.addData('{comp.name}.x', {comp.name}.x)",  # should add testMouse.x at the end
+                      f"{comp.name}.x.append(x)",  # should contain code to update testMouse.x in frame loop
                       "if gotValidClick:"],  # should check for valid clicks
-             'avoid': ["thisExp.addData('testMouse.x', x)"]},  # should not add final value of x
+             'avoid': [f"thisExp.addData('{comp.name}.x', x)"]},  # should not add final value of x
             {'val': "every frame",
-             'want': ["thisExp.addData('testMouse.x', testMouse.x)",  # should add testMouse.x at the end
-                      "testMouse.x.append(x)"],  # should contain code to update testMouse.x in frame loop
-             'avoid': ["thisExp.addData('testMouse.x', x)"]},  # should not add final value of x
+             'want': [f"thisExp.addData('{comp.name}.x', {comp.name}.x)",  # should add testMouse.x at the end
+                      f"{comp.name}.x.append(x)"],  # should contain code to update testMouse.x in frame loop
+             'avoid': [f"thisExp.addData('{comp.name}.x', x)"]},  # should not add final value of x
             {'val': "never",
              'want': [],
-             'avoid': ["thisExp.addData('testMouse.x', testMouse.x)",  # should not add testMouse.x at the end
-                       "testMouse.x.append(x)",  # should not contain code to update testMouse.x in frame loop
-                       "thisExp.addData('testMouse.x', x)"]},  # should not add final value of x]},
+             'avoid': [f"thisExp.addData('{comp.name}.x', {comp.name}.x)",  # should not add testMouse.x at the end
+                       f"{comp.name}.x.append(x)",  # should not contain code to update testMouse.x in frame loop
+                       f"thisExp.addData('{comp.name}.x', x)"]},  # should not add final value of x]},
         ]
         forceEndRoutineOnPressCases = [
             {'val':  "never",
@@ -85,54 +72,54 @@ class TestMouseComponent(_TestBaseComponentsMixin, _TestDisabledMixin):
         # Iterate through saveMouseState cases
         for SMScase in saveMouseStateCases:
             # Set saveMouseState
-            self.comp.params['saveMouseState'].val = SMScase['val']
+            comp.params['saveMouseState'].val = SMScase['val']
             for FEROPcase in forceEndRoutineOnPressCases:
                 # Set forceEndRoutineOnPress
-                self.comp.params['forceEndRoutineOnPress'].val = FEROPcase['val']
+                comp.params['forceEndRoutineOnPress'].val = FEROPcase['val']
                 for Ccase in clickableCases:
                     # Set clickable
-                    self.comp.params['clickable'].val = Ccase['val']
+                    comp.params['clickable'].val = Ccase['val']
 
                     # Compile script
-                    script = self.exp.writeScript(target="PsychoPy")
+                    script = exp.writeScript(target="PsychoPy")
                     try:
                         # Look for wanted phrases
                         for phrase in SMScase['want']:
                             assert phrase in script, (
-                                f"{phrase} not found in script when saveMouseState={self.comp.params['saveMouseState']}, "
-                                f"forceEndRoutineOnPress={self.comp.params['forceEndRoutineOnPress']} and "
-                                f"clickable={self.comp.params['clickable']}"
+                                f"{phrase} not found in script when saveMouseState={comp.params['saveMouseState']}, "
+                                f"forceEndRoutineOnPress={comp.params['forceEndRoutineOnPress']} and "
+                                f"clickable={comp.params['clickable']}"
                             )
                         for phrase in FEROPcase['want']:
                             assert phrase in script, (
-                                f"{phrase} not found in script when saveMouseState={self.comp.params['saveMouseState']}, "
-                                f"forceEndRoutineOnPress={self.comp.params['forceEndRoutineOnPress']} and "
-                                f"clickable={self.comp.params['clickable']}"
+                                f"{phrase} not found in script when saveMouseState={comp.params['saveMouseState']}, "
+                                f"forceEndRoutineOnPress={comp.params['forceEndRoutineOnPress']} and "
+                                f"clickable={comp.params['clickable']}"
                             )
                         for phrase in Ccase['want']:
                             assert phrase in script, (
-                                f"{phrase} not found in script when saveMouseState={self.comp.params['saveMouseState']}, "
-                                f"forceEndRoutineOnPress={self.comp.params['forceEndRoutineOnPress']} and "
-                                f"clickable={self.comp.params['clickable']}"
+                                f"{phrase} not found in script when saveMouseState={comp.params['saveMouseState']}, "
+                                f"forceEndRoutineOnPress={comp.params['forceEndRoutineOnPress']} and "
+                                f"clickable={comp.params['clickable']}"
                             )
                         # Check there's no avoid phrases
                         for phrase in SMScase['avoid']:
                             assert phrase not in script, (
-                                f"{phrase} found in script when saveMouseState={self.comp.params['saveMouseState']}, "
-                                f"forceEndRoutineOnPress={self.comp.params['forceEndRoutineOnPress']} and "
-                                f"clickable={self.comp.params['clickable']}"
+                                f"{phrase} found in script when saveMouseState={comp.params['saveMouseState']}, "
+                                f"forceEndRoutineOnPress={comp.params['forceEndRoutineOnPress']} and "
+                                f"clickable={comp.params['clickable']}"
                             )
                         for phrase in FEROPcase['avoid']:
                             assert phrase not in script, (
-                                f"{phrase} found in script when saveMouseState={self.comp.params['saveMouseState']}, "
-                                f"forceEndRoutineOnPress={self.comp.params['forceEndRoutineOnPress']} and "
-                                f"clickable={self.comp.params['clickable']}"
+                                f"{phrase} found in script when saveMouseState={comp.params['saveMouseState']}, "
+                                f"forceEndRoutineOnPress={comp.params['forceEndRoutineOnPress']} and "
+                                f"clickable={comp.params['clickable']}"
                             )
                         for phrase in Ccase['avoid']:
                             assert phrase not in script, (
-                                f"{phrase} found in script when saveMouseState={self.comp.params['saveMouseState']}, "
-                                f"forceEndRoutineOnPress={self.comp.params['forceEndRoutineOnPress']} and "
-                                f"clickable={self.comp.params['clickable']}"
+                                f"{phrase} found in script when saveMouseState={comp.params['saveMouseState']}, "
+                                f"forceEndRoutineOnPress={comp.params['forceEndRoutineOnPress']} and "
+                                f"clickable={comp.params['clickable']}"
                             )
                     except AssertionError as err:
                         # If any assertion fails, save script to view

psychopy-2024.1.2/psychopy/tests/test_experiment/test_components/test_Polygon.py → psychopy-2024.1.3/psychopy/tests/test_experiment/test_components/test_PolygonComponent.py

@@ -1,37 +1,21 @@
-from pathlib import Path
-
-from . import _TestDisabledMixin, _TestBaseComponentsMixin
-from psychopy.experiment import Experiment
-from psychopy.experiment.loops import TrialHandler
-from psychopy.experiment.routines import Routine
+from psychopy.tests.test_experiment.test_components.test_base_components import BaseComponentTests, _TestLibraryClassMixin
 from psychopy.experiment.components.polygon import PolygonComponent
 from psychopy.visual.polygon import Polygon
 
 
-class TestPolygonComponent(_TestBaseComponentsMixin, _TestDisabledMixin):
+class TestPolygonComponent(BaseComponentTests, _TestLibraryClassMixin):
     """
     Test that Polygon coponents have the correct params and write as expected.
     """
+    comp = PolygonComponent
     libraryClass = Polygon
 
-    def setup_method(self):
-        # Make blank experiment
-        self.exp = Experiment()
-        # Make blank routine
-        self.routine = Routine(name="testRoutine", exp=self.exp)
-        self.exp.addRoutine("testRoutine", self.routine)
-        self.exp.flow.addRoutine(self.routine, 0)
-        # Add loop around routine
-        self.loop = TrialHandler(exp=self.exp, name="testLoop")
-        self.exp.flow.addLoop(self.loop, 0, -1)
-        # Make a rect for when we need something to click on
-        self.comp = PolygonComponent(exp=self.exp, parentName="testRoutine", name="testPolygon")
-        self.routine.addComponent(self.comp)
-
     def test_vertices_usage(self):
         """
         Test that vertices values are used only under the correct conditions
         """
+        # make minimal experiment just for this test
+        comp, rt, exp = self.make_minimal_experiment()
         # Define values to look for and avoid in code according to value of shape
         cases = [
             # Shape is a line
@@ -61,14 +45,14 @@ class TestPolygonComponent(_TestBaseComponentsMixin, _TestDisabledMixin):
              'avoid': ["___nVertices___"]},
         ]
         # Setup component with markers for nVertices and vertices
-        self.comp.params['nVertices'].val = "___nVertices___"
-        self.comp.params['vertices'].val = "___vertices___"
+        comp.params['nVertices'].val = "___nVertices___"
+        comp.params['vertices'].val = "___vertices___"
         # Test each case
         for case in cases:
             # Set shape
-            self.comp.params['shape'].val = case['val']
+            comp.params['shape'].val = case['val']
             # Write experiment
-            pyScript = self.exp.writeScript(target="PsychoPy")
+            pyScript = exp.writeScript(target="PsychoPy")
             # Look for sought values in experiment script
             for seekVal in case['seek']:
                 assert seekVal in pyScript, (

psychopy-2024.1.2/psychopy/tests/test_experiment/test_components/test_ResourceManager.py → psychopy-2024.1.3/psychopy/tests/test_experiment/test_components/test_ResourceManagerComponent.py

@@ -1,23 +1,13 @@
 from pathlib import Path
 
-from . import _TestBaseComponentsMixin, _TestDisabledMixin
-from .test_base_components import _find_global_resource_in_js_experiment
+from psychopy.tests.test_experiment.test_components.test_base_components import BaseComponentTests, _find_global_resource_in_js_experiment
 from psychopy.experiment.components.resourceManager import ResourceManagerComponent
 from psychopy import experiment
 from ...utils import TESTS_DATA_PATH
 
 
-class TestResourceManagerComponent(_TestBaseComponentsMixin, _TestDisabledMixin):
-    def setup_method(self):
-        # Make blank experiment
-        self.exp = experiment.Experiment()
-        # Make blank routine
-        self.routine = experiment.routines.Routine(name="testRoutine", exp=self.exp)
-        self.exp.addRoutine("testRoutine", self.routine)
-        self.exp.flow.addRoutine(self.routine, 0)
-        # Make Resource Manager component
-        self.comp = ResourceManagerComponent(exp=self.exp, parentName="testRoutine", name="testResourceManager")
-        self.routine.addComponent(self.comp)
+class TestResourceManagerComponent(BaseComponentTests):
+    comp = ResourceManagerComponent
 
     def test_handled_resources_removed(self):
         """

psychopy-2024.1.2/psychopy/tests/test_experiment/test_components/test_Settings.py → psychopy-2024.1.3/psychopy/tests/test_experiment/test_components/test_SettingsComponent.py

@@ -1,13 +1,11 @@
 from pathlib import Path
 
-from . import _TestBaseComponentsMixin, _TestDisabledMixin
 from .test_base_components import _find_global_resource_in_js_experiment
-from psychopy.experiment.components.settings import SettingsComponent
 from psychopy import experiment
 from ...utils import TESTS_DATA_PATH
 
 
-class TestSettingsComponent(_TestBaseComponentsMixin):
+class TestSettingsComponent:
     def test_unhandled_resources_js(self):
         """
         Check that resources not otherwise handled are present at the start of the experiment

psychopy-2024.1.2/psychopy/tests/test_experiment/test_components/test_Static.py → psychopy-2024.1.3/psychopy/tests/test_experiment/test_components/test_StaticComponent.py

@@ -1,23 +1,14 @@
 from pathlib import Path
 
-from . import _TestBaseComponentsMixin, _TestDisabledMixin
+from . import BaseComponentTests
 from .test_base_components import _find_global_resource_in_js_experiment
 from psychopy.experiment.components.static import StaticComponent
 from psychopy import experiment, data
 from ...utils import TESTS_DATA_PATH
 
 
-class TestStaticComponent(_TestBaseComponentsMixin, _TestDisabledMixin):
-    def setup_method(self):
-        # Make blank experiment
-        self.exp = experiment.Experiment()
-        # Make blank routine
-        self.routine = experiment.routines.Routine(name="testRoutine", exp=self.exp)
-        self.exp.addRoutine("testRoutine", self.routine)
-        self.exp.flow.addRoutine(self.routine, 0)
-        # Make Static component
-        self.comp = StaticComponent(exp=self.exp, parentName="testRoutine", name="testStatic")
-        self.routine.addComponent(self.comp)
+class TestStaticComponent(BaseComponentTests):
+    comp = StaticComponent
 
     def test_handled_resources_removed(self):
         """

{psychopy-2024.1.2 → psychopy-2024.1.3}/psychopy/tests/test_experiment/test_components/test_all_components.py

@@ -1,10 +1,10 @@
 from psychopy.experiment.exports import IndentingBuffer
-from . import _TestBaseComponentsMixin, _TestDisabledMixin
+from . import BaseComponentTests
 from psychopy import experiment
 import inspect
 
 
-class _Generic(_TestBaseComponentsMixin, _TestDisabledMixin):
+class _Generic(BaseComponentTests):
     def __init__(self, compClass):
         self.exp = experiment.Experiment()
         self.rt = experiment.routines.Routine(exp=self.exp, name="testRoutine")
@@ -18,14 +18,12 @@ def test_all_components():
     for compName, compClass in experiment.getAllComponents().items():
         if compName == "SettingsComponent":
             continue
-        # Make a generic testing object for this component
-        tester = _Generic(compClass)
-        # Run each method from _TestBaseComponentsMixin on tester
-        for attr, meth in _TestBaseComponentsMixin.__dict__.items():
-            if inspect.ismethod(meth):
-                meth(tester)
-        # Run each method from _TestBaseComponentsMixin on tester
-        for attr, meth in _TestDisabledMixin.__dict__.items():
+        # make a generic testing object for this component
+        tester = BaseComponentTests()
+        # make sure it has a comp class assigned
+        tester.comp = compClass
+        # Run each method from BaseComponentTests on tester
+        for attr, meth in BaseComponentTests.__dict__.items():
             if inspect.ismethod(meth):
                 meth(tester)
 
@@ -104,59 +102,3 @@ def test_visual_set_autodraw():
             f"{compName} does not set autoDraw in its Each Frame code. If this is acceptable, add the component name "
             f"to `skipComponents`."
         )
-
-def test_indentation_consistency():
-    """
-    No component should exit any of its write methods at a different indent level as it entered, as this would break
-    subsequent components / routines.
-    """
-    for compName, compClass in experiment.getAllComponents().items():
-        if compName == "SettingsComponent":
-            continue
-        # Make a generic testing object for this component
-        tester = _Generic(compClass)
-        # Skip if component doesn't have a start/stop time
-        if "startVal" not in tester.comp.params or "stopVal" not in tester.comp.params:
-            continue
-        # Check that each write method exits at the same indent level as it entered
-        buff = IndentingBuffer(target="PsychoPy")
-        msg = "Writing {} code for {} changes indent level by {} when start is `{}` and stop is `{}`."
-        # Setup flow for writing
-        tester.exp.flow.writeStartCode(buff)
-        # Try combinations of start/stop being set/unset
-        cases = [
-            {"startVal": "0", "stopVal": "1"},
-            {"startVal": "", "stopVal": "1"},
-            {"startVal": "0", "stopVal": ""},
-            {"startVal": "", "stopVal": ""},
-        ]
-        for case in cases:
-            tester.comp.params["startType"].val = "time (s)"
-            tester.comp.params["stopType"].val = "time (s)"
-            for param, val in case.items():
-                tester.comp.params[param].val = val
-            # Init
-            tester.comp.writeInitCode(buff)
-            assert buff.indentLevel == 0, msg.format(
-                "init", type(tester.comp).__name__, buff.indentLevel, case['startVal'], case['stopVal']
-            )
-            # Start routine
-            tester.comp.writeRoutineStartCode(buff)
-            assert buff.indentLevel == 0, msg.format(
-                "routine start", type(tester.comp).__name__, buff.indentLevel, case['startVal'], case['stopVal']
-            )
-            # Each frame
-            tester.comp.writeFrameCode(buff)
-            assert buff.indentLevel == 0, msg.format(
-                "each frame", type(tester.comp).__name__, buff.indentLevel, case['startVal'], case['stopVal']
-            )
-            # End routine
-            tester.comp.writeRoutineEndCode(buff)
-            assert buff.indentLevel == 0, msg.format(
-                "routine end", type(tester.comp).__name__, buff.indentLevel, case['startVal'], case['stopVal']
-            )
-            # End experiment
-            tester.comp.writeExperimentEndCode(buff)
-            assert buff.indentLevel == 0, msg.format(
-                "experiment end", type(tester.comp).__name__, buff.indentLevel, case['startVal'], case['stopVal']
-            )