psychopy 2024.2.1__py3-none-any.whl → 2024.2.4__py3-none-any.whl

psychopy/tests/test_app/test_builder/data/_2021_ 5_03_1324.log

@@ -0,0 +1,168 @@
+33.3484 	DATA 	Keypress: lcommand
+33.8965 	EXP 	Created window1 = Window(allowGUI=True, allowStencil=False, autoLog=True, backendConf=UNKNOWN, bitsMode=UNKNOWN, blendMode='avg', bpc=(8, 8, 8), color=array([0, 0, 0]), colorSpace='rgb', depthBits=8, fullscr=<method-wrapper '__getattribute__' of attributeSetter object at 0x7f833a66c828>, gamma=None, gammaErrorPolicy='raise', lms=UNKNOWN, monitor=<psychopy.monitors.calibTools.Monitor object at 0x7f833b62bba8>, multiSample=False, name='window1', numSamples=2, pos=[696.0, 410.0], screen=0, size=array([1600, 1200]), stencilBits=0, stereo=False, units='height', useFBO=True, useRetina=True, viewOri=0.0, viewPos=None, viewScale=None, waitBlanking=True, winType='pyglet')
+33.8967 	EXP 	window1: mouseVisible = True
+33.8967 	EXP 	window1: recordFrameIntervals = False
+34.0620 	EXP 	window1: recordFrameIntervals = True
+34.2144 	WARNING 	t of last frame was 22.15ms (=1/45)
+34.7249 	WARNING 	t of last frame was 32.26ms (=1/31)
+34.7468 	WARNING 	t of last frame was 21.95ms (=1/45)
+34.9128 	EXP 	window1: recordFrameIntervals = False
+35.6135 	EXP 	Created blockIntroText = TextStim(__class__=<class 'psychopy.visual.text.TextStim'>, alignHoriz=method-wrapper(...), alignText='center', alignVert=method-wrapper(...), anchorHoriz='center', anchorVert='center', antialias=True, autoLog=True, bold=False, color=array([1, 1, 1]), colorSpace='rgb', contrast=1.0, depth=0.0, flipHoriz=False, flipVert=False, font='Arial', fontFiles=[], height=0.1, italic=False, languageStyle='LTR', name='blockIntroText', opacity=1, ori=0, pos=array([0., 0.]), rgb=UNKNOWN, text="You're about to start a new block", units='height', win=Window(...), wrapWidth=1)
+35.6143 	EXP 	Created stimInfo = TextStim(__class__=<class 'psychopy.visual.text.TextStim'>, alignHoriz=method-wrapper(...), alignText='center', alignVert=method-wrapper(...), anchorHoriz='center', anchorVert='center', antialias=True, autoLog=True, bold=False, color=array([1, 1, 1]), colorSpace='rgb', contrast=1.0, depth=0.0, flipHoriz=False, flipVert=False, font='Arial', fontFiles=[], height=0.1, italic=False, languageStyle='LTR', name='stimInfo', opacity=1, ori=0, pos=array([0., 0.]), rgb=UNKNOWN, text='', units='height', win=Window(...), wrapWidth=1)
+35.6147 	EXP 	Created sequence: random, trialTypes=1, nReps=4, seed=None
+35.6149 	EXP 	New trial (rep=0, index=0): None
+35.6409 	EXP 	blockIntroText: autoDraw = True
+36.1161 	EXP 	Created sequence: random, trialTypes=1, nReps=2, seed=None
+36.1163 	EXP 	New trial (rep=0, index=0): None
+36.1166 	EXP 	Created sequence: random, trialTypes=1, nReps=3, seed=None
+36.1167 	EXP 	New trial (rep=0, index=0): None
+36.1268 	EXP 	blockIntroText: autoDraw = False
+36.1268 	EXP 	stimInfo: text = 'stim 0'
+36.2098 	EXP 	stimInfo: autoDraw = True
+36.2938 	EXP 	New trial (rep=1, index=0): None
+36.2972 	EXP 	stimInfo: autoDraw = False
+36.2972 	EXP 	stimInfo: autoDraw = False
+36.2972 	EXP 	stimInfo: text = 'stim 1'
+36.3680 	EXP 	stimInfo: autoDraw = True
+36.4529 	EXP 	New trial (rep=2, index=0): None
+36.4602 	EXP 	stimInfo: autoDraw = False
+36.4602 	EXP 	stimInfo: autoDraw = False
+36.4602 	EXP 	stimInfo: text = 'stim 2'
+36.5320 	EXP 	stimInfo: autoDraw = True
+36.6197 	EXP 	New trial (rep=1, index=0): None
+36.6200 	EXP 	Created sequence: random, trialTypes=1, nReps=3, seed=None
+36.6202 	EXP 	New trial (rep=0, index=0): None
+36.6233 	EXP 	stimInfo: autoDraw = False
+36.6233 	EXP 	stimInfo: autoDraw = False
+36.6233 	EXP 	stimInfo: text = 'stim 0'
+36.7158 	EXP 	stimInfo: autoDraw = True
+36.7994 	EXP 	New trial (rep=1, index=0): None
+36.8023 	EXP 	stimInfo: autoDraw = False
+36.8023 	EXP 	stimInfo: autoDraw = False
+36.8023 	EXP 	stimInfo: text = 'stim 1'
+36.8714 	EXP 	stimInfo: autoDraw = True
+36.9553 	EXP 	New trial (rep=2, index=0): None
+36.9581 	EXP 	stimInfo: autoDraw = False
+36.9581 	EXP 	stimInfo: autoDraw = False
+36.9581 	EXP 	stimInfo: text = 'stim 2'
+37.0264 	EXP 	stimInfo: autoDraw = True
+37.1406 	EXP 	New trial (rep=1, index=0): None
+37.1446 	EXP 	stimInfo: autoDraw = False
+37.1446 	EXP 	stimInfo: autoDraw = False
+37.1446 	EXP 	blockIntroText: autoDraw = True
+37.6302 	EXP 	Created sequence: random, trialTypes=1, nReps=2, seed=None
+37.6304 	EXP 	New trial (rep=0, index=0): None
+37.6306 	EXP 	Created sequence: random, trialTypes=1, nReps=3, seed=None
+37.6308 	EXP 	New trial (rep=0, index=0): None
+37.6339 	EXP 	blockIntroText: autoDraw = False
+37.6339 	EXP 	blockIntroText: autoDraw = False
+37.6339 	EXP 	stimInfo: text = 'stim 0'
+37.7138 	EXP 	stimInfo: autoDraw = True
+37.7979 	EXP 	New trial (rep=1, index=0): None
+37.8006 	EXP 	stimInfo: autoDraw = False
+37.8006 	EXP 	stimInfo: autoDraw = False
+37.8006 	EXP 	stimInfo: text = 'stim 1'
+37.8698 	EXP 	stimInfo: autoDraw = True
+37.9535 	EXP 	New trial (rep=2, index=0): None
+37.9561 	EXP 	stimInfo: autoDraw = False
+37.9561 	EXP 	stimInfo: autoDraw = False
+37.9561 	EXP 	stimInfo: text = 'stim 2'
+38.0249 	EXP 	stimInfo: autoDraw = True
+38.1085 	EXP 	New trial (rep=1, index=0): None
+38.1087 	EXP 	Created sequence: random, trialTypes=1, nReps=3, seed=None
+38.1089 	EXP 	New trial (rep=0, index=0): None
+38.1116 	EXP 	stimInfo: autoDraw = False
+38.1116 	EXP 	stimInfo: autoDraw = False
+38.1116 	EXP 	stimInfo: text = 'stim 0'
+38.1800 	EXP 	stimInfo: autoDraw = True
+38.2633 	EXP 	New trial (rep=1, index=0): None
+38.2660 	EXP 	stimInfo: autoDraw = False
+38.2660 	EXP 	stimInfo: autoDraw = False
+38.2660 	EXP 	stimInfo: text = 'stim 1'
+38.3351 	EXP 	stimInfo: autoDraw = True
+38.4183 	EXP 	New trial (rep=2, index=0): None
+38.4214 	EXP 	stimInfo: autoDraw = False
+38.4214 	EXP 	stimInfo: autoDraw = False
+38.4214 	EXP 	stimInfo: text = 'stim 2'
+38.4896 	EXP 	stimInfo: autoDraw = True
+38.6173 	EXP 	New trial (rep=2, index=0): None
+38.6215 	EXP 	stimInfo: autoDraw = False
+38.6215 	EXP 	stimInfo: autoDraw = False
+38.6215 	EXP 	blockIntroText: autoDraw = True
+39.1054 	EXP 	Created sequence: random, trialTypes=1, nReps=2, seed=None
+39.1055 	EXP 	New trial (rep=0, index=0): None
+39.1057 	EXP 	Created sequence: random, trialTypes=1, nReps=3, seed=None
+39.1058 	EXP 	New trial (rep=0, index=0): None
+39.1088 	EXP 	blockIntroText: autoDraw = False
+39.1088 	EXP 	blockIntroText: autoDraw = False
+39.1088 	EXP 	stimInfo: text = 'stim 0'
+39.1780 	EXP 	stimInfo: autoDraw = True
+39.2619 	EXP 	New trial (rep=1, index=0): None
+39.2650 	EXP 	stimInfo: autoDraw = False
+39.2650 	EXP 	stimInfo: autoDraw = False
+39.2650 	EXP 	stimInfo: text = 'stim 1'
+39.3345 	EXP 	stimInfo: autoDraw = True
+39.4183 	EXP 	New trial (rep=2, index=0): None
+39.4211 	EXP 	stimInfo: autoDraw = False
+39.4211 	EXP 	stimInfo: autoDraw = False
+39.4211 	EXP 	stimInfo: text = 'stim 2'
+39.4902 	EXP 	stimInfo: autoDraw = True
+39.5743 	EXP 	New trial (rep=1, index=0): None
+39.5745 	EXP 	Created sequence: random, trialTypes=1, nReps=3, seed=None
+39.5746 	EXP 	New trial (rep=0, index=0): None
+39.5774 	EXP 	stimInfo: autoDraw = False
+39.5774 	EXP 	stimInfo: autoDraw = False
+39.5774 	EXP 	stimInfo: text = 'stim 0'
+39.6459 	EXP 	stimInfo: autoDraw = True
+39.7294 	EXP 	New trial (rep=1, index=0): None
+39.7326 	EXP 	stimInfo: autoDraw = False
+39.7326 	EXP 	stimInfo: autoDraw = False
+39.7326 	EXP 	stimInfo: text = 'stim 1'
+39.8018 	EXP 	stimInfo: autoDraw = True
+39.8853 	EXP 	New trial (rep=2, index=0): None
+39.8880 	EXP 	stimInfo: autoDraw = False
+39.8880 	EXP 	stimInfo: autoDraw = False
+39.8880 	EXP 	stimInfo: text = 'stim 2'
+39.9563 	EXP 	stimInfo: autoDraw = True
+40.0685 	EXP 	New trial (rep=3, index=0): None
+40.0724 	EXP 	stimInfo: autoDraw = False
+40.0724 	EXP 	stimInfo: autoDraw = False
+40.0724 	EXP 	blockIntroText: autoDraw = True
+40.5561 	EXP 	Created sequence: random, trialTypes=1, nReps=2, seed=None
+40.5562 	EXP 	New trial (rep=0, index=0): None
+40.5564 	EXP 	Created sequence: random, trialTypes=1, nReps=3, seed=None
+40.5565 	EXP 	New trial (rep=0, index=0): None
+40.5595 	EXP 	blockIntroText: autoDraw = False
+40.5595 	EXP 	blockIntroText: autoDraw = False
+40.5595 	EXP 	stimInfo: text = 'stim 0'
+40.6282 	EXP 	stimInfo: autoDraw = True
+40.7120 	EXP 	New trial (rep=1, index=0): None
+40.7156 	EXP 	stimInfo: autoDraw = False
+40.7156 	EXP 	stimInfo: autoDraw = False
+40.7156 	EXP 	stimInfo: text = 'stim 1'
+40.7845 	EXP 	stimInfo: autoDraw = True
+40.8684 	EXP 	New trial (rep=2, index=0): None
+40.8712 	EXP 	stimInfo: autoDraw = False
+40.8712 	EXP 	stimInfo: autoDraw = False
+40.8712 	EXP 	stimInfo: text = 'stim 2'
+40.9400 	EXP 	stimInfo: autoDraw = True
+41.0239 	EXP 	New trial (rep=1, index=0): None
+41.0241 	EXP 	Created sequence: random, trialTypes=1, nReps=3, seed=None
+41.0243 	EXP 	New trial (rep=0, index=0): None
+41.0270 	EXP 	stimInfo: autoDraw = False
+41.0270 	EXP 	stimInfo: autoDraw = False
+41.0270 	EXP 	stimInfo: text = 'stim 0'
+41.0959 	EXP 	stimInfo: autoDraw = True
+41.1788 	EXP 	New trial (rep=1, index=0): None
+41.1816 	EXP 	stimInfo: autoDraw = False
+41.1816 	EXP 	stimInfo: autoDraw = False
+41.1816 	EXP 	stimInfo: text = 'stim 1'
+41.2501 	EXP 	stimInfo: autoDraw = True
+41.3342 	EXP 	New trial (rep=2, index=0): None
+41.3371 	EXP 	stimInfo: autoDraw = False
+41.3371 	EXP 	stimInfo: autoDraw = False
+41.3371 	EXP 	stimInfo: text = 'stim 2'
+41.4059 	EXP 	stimInfo: autoDraw = True
+41.5522 	EXP 	stimInfo: autoDraw = False
+41.5522 	EXP 	stimInfo: autoDraw = False
+41.5612 	EXP 	window1: mouseVisible = True

psychopy/tests/test_hardware/test_CRS_BitsSharp.py.orig

@@ -0,0 +1,68 @@
+# -*- coding: utf-8 -*-
+"""
+Created on Thu May  8 10:46:41 2014
+
+@author: jon.peirce
+"""
+import pytest
+from psychopy import visual, core
+from psychopy.hardware import crs
+
+
+def test_bitsSharp():
+    win = visual.Window(screen=1, fullscr=True, useFBO=True, autoLog=True)
+    win.setGamma(1.0) #make sure gfx card LUT is identity
+    #initialise BitsSharp
+    try:
+        bits = crs.BitsSharp(win=win, mode='color++')
+    except ImportError:
+        pytest.skip("crs.BitsSharp: could not initialize. possible:\nfrom serial.tools import list_ports\n"
+           "ImportError: No module named tools")
+
+    if not bits.OK:
+        win.close()
+        pytest.skip("No BitsSharp connected")
+        
+    print(bits.info)
+
+    #switch to status screen (while keeping in mono 'mode')
+    bits.getVideoLine(lineN=1, nPixels=1)
+    core.wait(5) #wait for status mode to take effect
+
+<<<<<<< HEAD
+    #createa  stimulus to check luminance values
+    screenSqr = visual.GratingStim(win, tex=None, mask=None, size=2)
+=======
+    #create a stimulus to check luminance values
+    screenSqr = visual.GratingStim(win,tex=None, mask=None,
+               size=2)
+>>>>>>> release
+
+    print('\n  up from zero:')
+    bit16 = (2.0 ** 16) - 1
+    for frameN in range(5):
+        intensity = frameN / bit16
+        screenSqr.color = intensity * 2 - 1  # psychopy is -1:1
+        screenSqr.draw()
+        win.flip()
+        pixels = bits.getVideoLine(lineN=1, nPixels=2)
+        print(pixels[0], pixels[1], intensity)
+
+    print('\n  down from 1:')
+    for frameN in range(5):
+        intensity = 1 - (frameN / bit16)
+        screenSqr.color = intensity * 2 - 1  # psychopy is -1:1
+        screenSqr.draw()
+        win.flip()
+        pixels = bits.getVideoLine(lineN=1, nPixels=2)
+        print(pixels[0], pixels[1], intensity)
+
+    print('\n  check the middle::')
+    for intensity in [0.5, 0.5 + (1 / bit16)]:
+        screenSqr.color = intensity * 2 - 1  # psychopy is -1:1
+        screenSqr.draw()
+        win.flip()
+        pixels = bits.getVideoLine(lineN=1, nPixels=2)
+        print(pixels[0], pixels[1], intensity)
+
+    bits.mode = "color++" #get out of status screen

psychopy/tests/test_tools/test_arraytools.py

@@ -128,3 +128,115 @@ def test_AliasDict():
     params2.alias("1", alias="one")
     assert "one" not in params.aliases
     assert "1" not in params.aliases
+
+
+class TestIndexDict:
+    def setup_method(self):
+        self.recreateData()
+    
+    def recreateData(self):
+        """
+        Recreate the test index dict from scratch, in case it changed over the course of a test.
+        """
+        self.data = at.IndexDict({
+            'someKey': "abc",
+            'someOtherKey': "def",
+            'anotherOne': "ghi",
+            1: "jkl",
+        })
+    
+    def test_isinstance(self):
+        """
+        Check that an IndexDict is an instance of dict
+        """
+        assert isinstance(self.data, dict)
+    
+    def test_length(self):
+        """
+        Check that an IndexDict reports its length as the number of explicit keys, ignoring 
+        positional indices.
+        """
+        assert len(self.data) == 4
+    
+    def test_get_item(self):
+        """
+        Check that items in an IndexDict can be got as expected, explicit keys should always take 
+        precedence over positional indices.
+        """
+        cases = [
+            # positional indices
+            (0, "abc"),
+            (2, "ghi"),
+            (3, "jkl"),
+            # explicit indices
+            ('someKey', "abc"),
+            ('someOtherKey', "def"),
+            ('anotherOne', "ghi"),
+            # conflicting indices (should favour explicit)
+            (1, "jkl"),
+        ]
+        # iterate through cases
+        for key, value in cases:
+            # check that each key returns the correct value
+            assert self.data[key] == value
+    
+    def test_set_item(self):
+        """
+        Check that items in an IndexDict can be set as expected, should set by position only if the 
+        positional index is not already defined as an explicit key.
+        """
+        cases = [
+            # set by positional index (no conflict)
+            {'set': (0, "mno"), 'get': (0, "mno")},
+            {'set': (0, "mno"), 'get': ('someKey', "mno")},
+            # set by explicit key (no conflict)
+            {'set': ('someKey', "mno"), 'get': (0, "mno")},
+            {'set': ('someKey', "mno"), 'get': ('someKey', "mno")},
+            # set by explicit string (when its positional index is also a key)
+            {'set': ('someOtherKey', "pqr"), 'get': ('someOtherKey', "pqr")},
+            {'set': ('someOtherKey', "mno"), 'get': (1, "jkl")},
+            # set by positional index (when it's also a key)
+            {'set': (1, "pqr"), 'get': ('someOtherKey', "def")},
+            {'set': (1, "pqr"), 'get': (1, "pqr")},
+            # set by explicit key not yet in array
+            {'set': ('newKey', "stu"), 'get': ('newKey', "stu")},
+            {'set': ('newKey', "stu"), 'get': (4, "stu")},
+            # set by positional index not yet in array (should treat as explicit key)
+            {'set': (6, "stu"), 'get': (6, "stu")},
+        ]
+        # iterate through cases
+        for case in cases:
+            # recreate data to clear last changes
+            self.recreateData()
+            # get values to set and expected values to return
+            seti, setval = case['set']
+            geti, getval = case['get']
+            # set value
+            self.data[seti] = setval
+            # check value
+            assert self.data[geti] == getval, (
+                f"After setting data[{repr(seti)}] = {repr(setval)} expected to get data["
+                f"{repr(geti)}] == {repr(getval)}, but instead got data[{repr(geti)}] == "
+                f"{repr(self.data[geti])}"
+            )
+    
+    def test_key_error(self):
+        """
+        Check that supplying an invalid key/index to an IndexDict still errors like a normal 
+        dict/list
+        """
+        cases = [
+            # index bigger than array
+            (4, KeyError, "4 should be out of bounds, but got {}"),
+            # key not in array
+            ('lalala', KeyError, "There shouldn't be a value for 'lalala', but got {}"),
+        ]
+        for i, errType, msg in cases:
+            try:
+                val = self.data[i]
+            except errType as err:
+                # if it errors as expected, good!
+                pass
+            else:
+                # if no error, raise an assertion error with message
+                raise AssertionError(msg.format(val))

psychopy/tests/test_visual/test_image.py.orig

@@ -0,0 +1,219 @@
+from pathlib import Path
+
+from psychopy import visual, colors, core
+from .test_basevisual import _TestUnitsMixin
+from psychopy.tests.test_experiment.test_component_compile_python import _TestBoilerplateMixin
+from .. import utils
+
+from ..utils import TESTS_DATA_PATH
+
+
+class TestImage(_TestUnitsMixin, _TestBoilerplateMixin):
+    """
+    Test that images render as expected. Note: In BaseVisual tests, image colors will look different than
+    seems intuitive as foreColor will be set to `"blue"`.
+    """
+    def setup(self):
+        self.win = visual.Window()
+        self.obj = visual.ImageStim(
+            self.win,
+            str(Path(TESTS_DATA_PATH) / 'testimage.jpg'),
+            colorSpace='rgb1',
+        )
+
+    def test_anchor_flip(self):
+        """
+        Check that flipping the image doesn't flip the direction of the anchor
+        """
+        # Setup obj
+        self.obj.units = "height"
+        self.obj.pos = (0, 0)
+        self.obj.size = (0.5, 0.5)
+        self.obj.anchor = "bottom left"
+        # Flip vertically
+        self.obj.flipVert = True
+        self.obj.flipHoriz = False
+        # Check
+        self.win.flip()
+        self.obj.draw()
+        # self.win.getMovieFrame(buffer='back').save(Path(utils.TESTS_DATA_PATH) / "test_image_flip_anchor_vert.png")
+        utils.compareScreenshot("test_image_flip_anchor_vert.png", self.win, crit=7)
+        # Flip horizontally
+        self.obj.flipVert = False
+        self.obj.flipHoriz = True
+        # Check
+        self.win.flip()
+        self.obj.draw()
+        # self.win.getMovieFrame(buffer='back').save(Path(utils.TESTS_DATA_PATH) / "test_image_flip_anchor_horiz.png")
+        utils.compareScreenshot("test_image_flip_anchor_horiz.png", self.win, crit=7)
+
+<<<<<<< HEAD
+    def test_aspect_ratio(self):
+        """
+        Test that images set with one or both dimensions as None maintain their aspect ratio
+        """
+        cases = [
+            # norm 1:1
+            {"img": "default.png", "aspect": (1, 1),
+             "size": (None, 2), "units": "norm",
+             "tag": "default_xNone_yFull"},
+            {"img": "default.png", "aspect": (1, 1),
+             "size": (2, None), "units": "norm",
+             "tag": "default_xFull_yNone"},
+            {"img": "default.png", "aspect": (1, 1),
+             "size": (None, None), "units": "norm",
+             "tag": "default_xNone_yNone"},
+            {"img": "default.png", "aspect": (1, 1),
+             "size": None, "units": "norm",
+             "tag": "default_None"},
+            # height 1:1
+            {"img": "default.png", "aspect": (1, 1),
+             "size": (None, 1), "units": "height",
+             "tag": "default_xNone_yFull"},
+            {"img": "default.png", "aspect": (1, 1),
+             "size": (1 / self.win.size[1] * self.win.size[0], None), "units": "height",
+             "tag": "default_xFull_yNone"},
+            {"img": "default.png", "aspect": (1, 1),
+             "size": (None, None), "units": "height",
+             "tag": "default_xNone_yNone"},
+            {"img": "default.png", "aspect": (1, 1),
+             "size": None, "units": "height",
+             "tag": "default_None"},
+            # pix 1:1
+            {"img": "default.png", "aspect": (1, 1),
+             "size": (None, self.win.size[1]), "units": "pix",
+             "tag": "default_xNone_yFull"},
+            {"img": "default.png", "aspect": (1, 1),
+             "size": (self.win.size[0], None), "units": "pix",
+             "tag": "default_xFull_yNone"},
+            {"img": "default.png", "aspect": (1, 1),
+             "size": (None, None), "units": "pix",
+             "tag": "default_xNone_yNone"},
+            {"img": "default.png", "aspect": (1, 1),
+             "size": None, "units": "pix",
+             "tag": "default_None"},
+        ]
+        for case in cases:
+            # Set image
+            self.obj.image = case['img']
+            # Set size
+            self.obj.units = case['units']
+            self.obj.size = case['size']
+            # Check that aspect ratio is still correct
+            assert self.obj.aspectRatio == case['aspect']
+            # Check that image looks as expected
+            self.obj.draw()
+            filename = f"test_image_aspect_{case['tag']}.png"
+            # self.win.getMovieFrame(buffer='back').save(Path(utils.TESTS_DATA_PATH) / filename)
+            utils.compareScreenshot(Path(utils.TESTS_DATA_PATH) / filename, self.win, crit=7)
+            self.win.flip()
+=======
+
+class TestImageAnimation:
+    """
+    Tests for using ImageStim to create frame animations
+    """
+    @classmethod
+    def setup_class(cls):
+        nFrames = 16
+        # Define array of sizes/desired frame rates
+        cls.cases = [
+            {'size': 6 ** 2, 'fps': 16},
+            {'size': 8 ** 2, 'fps': 16},
+            {'size': 10 ** 2, 'fps': 8},
+            {'size': 12 ** 2, 'fps': 2},
+        ]
+        # Create frames
+        for i, case in enumerate(cls.cases):
+            size = case['size']
+            # Create window and shapes
+            win = visual.Window(size=(size, size), color='purple')
+            shape1 = visual.ShapeStim(win,
+                                      pos=(0.2, 0.2), size=(0.5, 0.5),
+                                      lineWidth=size * 0.1,
+                                      fillColor='red', lineColor='green',
+                                      )
+            shape2 = visual.ShapeStim(win,
+                                      pos=(-0.2, -0.2), size=(0.5, 0.5),
+                                      lineWidth=size * 0.1,
+                                      fillColor='blue', lineColor='yellow'
+                                      )
+
+            frames = []
+
+            for thisFrame in range(nFrames):
+                # Cycle window hue
+                win.color = colors.Color(
+                    (win._color.hsv[0] + 360 * thisFrame / nFrames, win._color.hsv[1], win._color.hsv[2]),
+                    'hsv'
+                )
+                # Cycle shape hues
+                shape1._fillColor.hsv = (
+                    shape1._fillColor.hsv[0] + 360 * thisFrame / nFrames, shape1._fillColor.hsv[1],
+                    shape1._fillColor.hsv[2]
+                )
+                shape1._borderColor.hsv = (
+                    shape1._borderColor.hsv[0] - 360 * thisFrame / nFrames, shape1._borderColor.hsv[1],
+                    shape1._borderColor.hsv[2]
+                )
+                shape2._fillColor.hsv = (
+                    shape2._fillColor.hsv[0] + 360 * thisFrame / nFrames, shape2._fillColor.hsv[1],
+                    shape2._fillColor.hsv[2]
+                )
+                shape2._borderColor.hsv = (
+                    shape2._borderColor.hsv[0] - 360 * thisFrame / nFrames, shape2._borderColor.hsv[1],
+                    shape2._borderColor.hsv[2]
+                )
+                # Rotate shapes
+                shape1.ori = shape1.ori + 360 * thisFrame / nFrames
+                shape2.ori = shape2.ori - 360 * thisFrame / nFrames
+                # Render
+                win.flip()
+                shape1.draw()
+                shape2.draw()
+                # Get frame
+                frame = win.getMovieFrame(buffer='back')
+                frames.append(
+                    frame
+                )
+
+            # Cleanup
+            win.close()
+            del shape1
+            del shape2
+            # Update case
+            cls.cases[i]['frames'] = frames
+
+    def test_fps(self):
+        """
+        Check that images can be updated sufficiently fast to create frame animations
+        """
+        # Create clock
+        clock = core.Clock()
+        # Try at each size
+        for case in self.cases:
+            size = case['size']
+            # Make window and image
+            win = visual.Window(size=(size, size))
+            img = visual.ImageStim(win, units='pix', size=(size, size))
+            # Iterate through frames
+            refr = []
+            for frame in case['frames']:
+                # Reset clock
+                clock.reset()
+                # Set image contents
+                img.image = frame
+                # Update
+                img.draw()
+                win.flip()
+                # Store time taken
+                refr.append(clock.getTime())
+            # Print frame rate for this size
+            fps = round(1 / max(refr))
+            assert fps > case['fps'], (
+                f"Max frame rate for {size}x{size} animations should be at least {case['fps']}, but was {fps}"
+            )
+            # Cleanup
+            win.close()
+            del img
+>>>>>>> 14bdb82f9dac0abd734f48d14e74d67e0eb3cc50

psychopy/tools/arraytools.py

@@ -21,6 +21,53 @@ import numpy
 import ctypes
 
 
+class IndexDict(dict):
+    """
+    A dict which allows for keys to be accessed by index as well as by key. Can be initialised 
+    from a dict, or from a set of keyword arguments.
+
+    Example
+    -------
+    ```
+    data = IndexDict({
+        'someKey': "abc",
+        'someOtherKey': "def",
+        'anotherOne': "ghi",
+        1: "jkl",
+    })
+    # using a numeric index will return the value for the key at that position
+    print(data[0])  # prints: abc
+    # ...unless that number is already a key
+    print(data[1])  # prints: jkl
+    ```
+    """
+    def __init__(self, arr=None, **kwargs):
+        # initialise dict
+        dict.__init__(self)
+        # if given no dict, use a blank one
+        if arr is None:
+            arr = {}
+        # if given a dict, update kwargs with it
+        kwargs.update(arr)
+        # set every key
+        for key, value in kwargs.items():
+            dict.__setitem__(self, key, value)
+    
+    def __getitem__(self, key):
+        # if key is a valid numeric index not present as a normal key, get matching key
+        if isinstance(key, int) and key < len(self) and key not in self:
+            return list(self.values())[key]
+        # index like normal
+        return dict.__getitem__(self, key)
+    
+    def __setitem__(self, key, value):
+        # if key is a valid numeric index not present as a normal key, get matching key
+        if isinstance(key, int) and key < len(self) and key not in self:
+            key = list(self.keys())[key]
+        # set like normal
+        return dict.__setitem__(self, key, value)
+
+
 def createXYs(x, y=None):
     """Create an Nx2 array of XY values including all combinations of the
     x and y values provided.

psychopy/tools/versionchooser.py

@@ -202,7 +202,7 @@ def getPsychoJSVersionStr(currentVersion, preferredVersion=''):
         # e.g. 2021.1.0 not 2021.1.0.dev3
         useVerStr = '.'.join(useVerStr.split('.')[:3])
     # PsychoJS doesn't have additional rc1 or dev1 releases
-    for versionSuffix in ["rc", "dev", "a", "b"]:
+    for versionSuffix in ["rc", "dev", "post", "a", "b"]:
         if versionSuffix in useVerStr:
             useVerStr = useVerStr.split(versionSuffix)[0]