psychopy 2024.1.2__py3-none-any.whl → 2024.1.4__py3-none-any.whl

psychopy/tests/test_hardware/test_keyboard.py

@@ -1,11 +1,19 @@
 import sys
 from psychopy.hardware import keyboard
-from pytest import skip
+import pytest
 import time
+from psychopy import logging
 
 
-class _TestKeyboard:
-    def testMakeAndReceiveMessage(self):
+class _TestBaseKeyboard:
+    """
+    Tests for the general functionality which should exist across Keyboard backends.
+    """
+    def testReceiveGeneratedKeypress(self):
+        """
+        Test that `KeyboardDevice.receiveMessage` can receive and interpret a KeyPress object
+        correctly, even when that object isn't linked to a physical keypress.
+        """
         # list of events to fake, time to fake them and state of getKeys outputs afterwards
         cases = [
             {'val': "a", 't': 0.1, 'len': 1},
@@ -24,10 +32,7 @@ class _TestKeyboard:
         """
         # skip this test on Linux (as MOP *is* slower due to having to use subprocess)
         if sys.platform == "linux":
-            skip()
-        # delete test kb
-        backend = self.kb._backend
-        del self.kb
+            pytest.skip()
 
         # array to store times
         times = {}
@@ -36,38 +41,170 @@ class _TestKeyboard:
 
         for mop in (True, False):
             # make new keyboard with muteOutsidePsychopy set as desired
-            kb = keyboard.KeyboardDevice(muteOutsidePsychopy=mop)
+            self.kb.muteOutsidePsychopy = mop
             # start timer
             start = time.time()
             # make 10000 responses
             for n in range(nResps):
-                kb.makeResponse(
+                self.kb.makeResponse(
                     code="a", tDown=0
                 )
             # get time
             times[mop] = time.time() - start
-            # delete keyboard
-            del kb
 
         # work out average difference per-response
         avg = (times[True] - times[False]) / nResps
         # make sure average difference will still be less than a frame on high performance monitors
         assert avg < 1/240
 
-        # recreate test kb
-        self.kb = keyboard.KeyboardDevice
+    def teardown_method(self):
+        # clear any keypresses
+        self.kb.getKeys(clear=True)
+        # set mute outside psychopy back to False
+        self.kb.muteOutsidePsychopy = False
+
+
+class _MillikeyMixin:
+    """
+    Mixin to add tests which use a Millikey device to generate keypresses. If no such device is
+    connected, these tests will all skip.
+    """
+    # this attribute should be overwritten when setup_class is called
+    millikey = None
+
+    def setup_class(self):
+        """
+        Create a serial object to interface with a Millikey device,
+        """
+        from psychopy.hardware.serialdevice import SerialDevice
+        from psychopy.tools import systemtools as st
+
+        # systemtools only works on Windows so skip millikey-dependent tests on other OS's
+        if sys.platform != "win32":
+            return
 
+        # use systemtools to find millikey port
+        for profile in st.systemProfilerWindowsOS(classname="Ports", connected=True):
+            # identify by driver name
+            if "usbser.inf" not in profile['Driver Name']:
+                continue
+            # find "COM" in profile description
+            desc = profile['Device Description']
+            start = desc.find("COM") + 3
+            end = desc.find(")", start)
+            # if there's no reference to a COM port, skip
+            if -1 in (start, end):
+                continue
+            # get COM port number
+            num = desc[start:end]
+            # if we've got this far, create device
+            self.millikey = SerialDevice(f"COM{num}", baudrate=128000)
+            # stop looking once we've got one
+            break
 
-class TestIohubKeyboard(_TestKeyboard):
+    def teardown_class(self):
+        """
+        Close Millikey before finishing tests.
+        """
+        if self.millikey is not None:
+            self.millikey.close()
+
+    def assertMillikey(self):
+        """
+        Make sure a Millikey device is connected (and skip the current test if not)
+        """
+        # if we didn't find a device, skip current test
+        if self.millikey is None:
+            pytest.skip()
+
+    def makeMillikeyKeypress(self, key, duration, delay=0):
+        """
+        Send a trigger to the Millikey device telling to to press a particular key.
+
+        Parameters
+        ----------
+        key : str
+            Key to press
+        duration : int
+            Duration (ms) of the keypress
+        delay : int
+            Delay (ms) before making the keypress
+        """
+        # make sure we have a millikey device
+        self.assertMillikey()
+        # construct command (see https://blog.labhackers.com/?p=285)
+        cmd = "KGEN {} {} {}".format(key, duration, delay)
+        # send
+        self.millikey.sendMessage(cmd)
+        # read any resp1
+        return self.millikey.getResponse()
+
+    def testReceivePhysicalKeypress(self):
+        """
+        Test that physical keypresses are detected.
+
+        Requires a Millikey device to run.
+        """
+        self.makeMillikeyKeypress(key="a", duration=10, delay=10)
+        # get last message
+        resp = self.kb.getKeys()[-1]
+        # check whether the created press was received
+        assert resp.name == "a"
+
+    def testPhysicalKeypressTiming(self):
+        """
+        Test that timing (tDown, rt, etc.) on KeyPress objects received via a physical key press
+        are correct.
+
+        Requires a Millikey device to run.
+        """
+        # define tolerance (ms) for this test
+        tolerance = 4
+        # try a few times to make sure times aren't cumulative
+        for ans, dur, rt in [
+            ("a", 123, 456),
+            ("b", 456, 123),
+            ("c", 123, 123),
+            ("d", 456, 456),
+        ]:
+            # reset keyboard clock
+            self.kb.clock.reset()
+            # wait for rt
+            time.sleep(rt / 1000)
+            # store start time
+            start = logging.defaultClock.getTime()
+            # make a keypress
+            self.makeMillikeyKeypress(key=ans, duration=dur)
+            # wait for press to finish
+            time.sleep(dur / 500)
+            # get last message
+            resp = self.kb.getKeys()[-1]
+            # check correct key
+            assert resp.name == ans
+            # check correct rt
+            assert abs(resp.rt - rt / 1000) <= tolerance / 1000
+            # check correct duration
+            assert abs(resp.duration - dur / 1000) <= tolerance / 1000
+            # check correct start time
+            assert abs(resp.tDown - start) <= tolerance / 1000
+
+
+class TestIohubKeyboard(_TestBaseKeyboard, _MillikeyMixin):
     def setup_method(self):
         self.kb = keyboard.KeyboardDevice(backend="iohub", muteOutsidePsychopy=False)
 
 
-class TestPtbKeyboard(_TestKeyboard):
+class TestPtbKeyboard(_TestBaseKeyboard, _MillikeyMixin):
     def setup_method(self):
         self.kb = keyboard.KeyboardDevice(backend="ptb", muteOutsidePsychopy=False)
 
+    def teardown_method(self):
+        self.kb.getKeys(clear=True)
+
 
-class TestEventKeyboard(_TestKeyboard):
+class TestEventKeyboard(_TestBaseKeyboard, _MillikeyMixin):
     def setup_method(self):
         self.kb = keyboard.KeyboardDevice(backend="event", muteOutsidePsychopy=False)
+
+    def teardown_method(self):
+        self.kb.getKeys(clear=True)

psychopy/visual/progress.py

@@ -83,7 +83,7 @@ class Progress(shape.ShapeStim):
     def __init__(
             self, win, name="pb",
             progress=0, direction="horizontal",
-            pos=(-.5, 0), size=(1, 0.1), anchor="center left", units=None,
+            pos=(-.5, 0), size=(1, 0.1), anchor="center-left", units=None,
             barColor=False, backColor=False, borderColor=False, colorSpace=None,
             lineWidth=1.5, opacity=1.0, ori=0.0,
             depth=0, autoLog=None, autoDraw=False,

psychopy/web.py

@@ -7,6 +7,7 @@
 # Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2024 Open Science Tools Ltd.
 # Distributed under the terms of the GNU General Public License (GPL).
 
+import pathlib
 import sys
 import socket
 import re
@@ -115,8 +116,10 @@ def getPacFiles():
             pacFiles.append(subkeys['AutoConfigURL'])
     elif sys.platform == 'darwin':
         import plistlib
-        sysPrefs = plistlib.readPlist('/Library/Preferences/System'
-                                      'Configuration/preferences.plist')
+        prefs_loc = pathlib.Path('/Library/Preferences/SystemConfiguration/preferences.plist')
+        if prefs_loc.exists():
+            with open(prefs_loc, 'rb') as fp :
+                sysPrefs = plistlib.loads(fp.read())
         networks = sysPrefs['NetworkServices']
         # loop through each possible network (e.g. Ethernet, Airport...)
         for network in list(networks.items()):

{psychopy-2024.1.2.dist-info → psychopy-2024.1.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: psychopy
-Version: 2024.1.2
+Version: 2024.1.4
 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.dist-info → psychopy-2024.1.4.dist-info}/RECORD

@@ -1,12 +1,12 @@
-psychopy-2024.1.2.dist-info/METADATA,sha256=M1igQPo08nMH1m8fmlLpFSVVdfg5b9-9IvJC1I0sEYU,6993
-psychopy-2024.1.2.dist-info/WHEEL,sha256=7sv5iXvIiTVJSnAxCz2tGBm9DHsb2vPSzeYeT7pvGUY,90
-psychopy-2024.1.2.dist-info/entry_points.txt,sha256=1LXVqRMSILrbEagrzpJDtmXyEPHX3GnpBJ85TEnxuoI,56
-psychopy-2024.1.2.dist-info/licenses/AUTHORS.md,sha256=MmZf-GmSBscBa_z7ePoqYxbaGe6XOJnld_s6JIQGfS4,2395
-psychopy-2024.1.2.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
+psychopy-2024.1.4.dist-info/METADATA,sha256=fDCS681nI8qyi-KWW8r5C0-9COz7XzsvfWVXnTU_dsY,6993
+psychopy-2024.1.4.dist-info/WHEEL,sha256=vnE8JVcI2Wz7GRKorsPArnBdnW2SWKWGow5gu5tHlRU,90
+psychopy-2024.1.4.dist-info/entry_points.txt,sha256=1LXVqRMSILrbEagrzpJDtmXyEPHX3GnpBJ85TEnxuoI,56
+psychopy-2024.1.4.dist-info/licenses/AUTHORS.md,sha256=MmZf-GmSBscBa_z7ePoqYxbaGe6XOJnld_s6JIQGfS4,2395
+psychopy-2024.1.4.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
 psychopy/CHANGELOG.txt,sha256=bRyB9AEemUO4KBYhtBOIWOaXFmX9X3pHgMMF9QyeITA,203527
 psychopy/LICENSE.txt,sha256=d2HeFOYbuXc2LZobE1EkFq3lYV5ge3YSaTL3y1r7KQc,746
 psychopy/LICENSES.txt,sha256=T59KljDkUEEtd40IHWS-S0OTSjzqueGD6oNmgqpRIf0,3145
-psychopy/__init__.py,sha256=tS0DFSNAdVdbqrTmPYpidSvE19az5kUVCOO6yrUaiWM,2757
+psychopy/__init__.py,sha256=Ui1G3d_Pxm-Ywc1gHe96JBFCD82M4IacVgxhkLGyHqU,2757
 psychopy/alerts/__init__.py,sha256=buvC7HFn71FhIp1D4XGXkZLeNLk22uO9TSQsxLlYZqU,2178
 psychopy/alerts/_alerts.py,sha256=IMHMXY1mzTCmlOYhHW0_Upb9oAcYzzTWe44BUNXj-ec,6120
 psychopy/alerts/_errorHandler.py,sha256=JNkdx3OJv0PeAeARG09Rgne7dH-aGgUdxdoriDd4KW4,1501
@@ -919,7 +919,7 @@ psychopy/app/builder/dialogs/dlgsCode.py,sha256=e6L80eZjVidfL3UwCLsGpha1uBJkfi3g
 psychopy/app/builder/dialogs/dlgsConditions.py,sha256=Q0yQaZCuWAMXKYboe4wiOrfFJxhr6rrhzvV00ZU16F8,29203
 psychopy/app/builder/dialogs/findDlg.py,sha256=XNixASyu0cUDRNuwxeixwA0U7-05QVmqJw2GfnexLwk,6839
 psychopy/app/builder/dialogs/paramCtrls.py,sha256=wWv2OB_ho1fLNTuOBvzh_oiI7CCbgLPd63QfSCTbMrY,47654
-psychopy/app/builder/localizedStrings.py,sha256=WRKzpvfRjJXoGRUrLhlbYDtyMXulLGUeyRZB5KvkU04,8973
+psychopy/app/builder/localizedStrings.py,sha256=nmXSLbpYhKWjGxPXKvwWmkY3foAIWVt0p1m0jM2wRUw,9043
 psychopy/app/builder/validators.py,sha256=9UNzKWZbza_8E9zptgZ9RiXEEpKQLyL8OnHkZMdQH74,21342
 psychopy/app/coder/__init__.py,sha256=hF476K91n-eIQmcyIKtOTM5Wwu5TOAni2mjg7dATlqA,164
 psychopy/app/coder/codeEditorBase.py,sha256=-y5ZtDeEV6KKCFzOFo4O3KlrHVUJ3UEiIQFHvp6aj64,18016
@@ -979,8 +979,8 @@ psychopy/app/locale/hu_HU/LC_MESSAGE/messages.mo,sha256=YL0OkWylqScel5-55e0UOTbr
 psychopy/app/locale/hu_HU/LC_MESSAGE/messages.po,sha256=lUwWIx2w6yCg1oSFolOAGoWTYq6gilECmOe8MzmSU1c,750
 psychopy/app/locale/it_IT/LC_MESSAGE/messages.mo,sha256=ZKMzzkn-3x5ctpBDJv25-S-4Q9dlaVD8MDgCBhJDbpg,625
 psychopy/app/locale/it_IT/LC_MESSAGE/messages.po,sha256=Hn2PHcXpyupdKp1vWZLV0T5Th1hSyaY59d7f0mVNE0c,247774
-psychopy/app/locale/ja_JP/LC_MESSAGE/messages.mo,sha256=bds8RYcMc7mbDAhhxlsTbp4QA4FWrGYRaur-fC_84bI,217288
-psychopy/app/locale/ja_JP/LC_MESSAGE/messages.po,sha256=hsCH_HHmVCePxYYJdY5BLn3RDB8H9OfPTKARZhyqD4g,326294
+psychopy/app/locale/ja_JP/LC_MESSAGE/messages.mo,sha256=aH5GhAQmHkaHqj3KpiL9dsAgWvcAGU6DYCqTr1L2aPw,217528
+psychopy/app/locale/ja_JP/LC_MESSAGE/messages.po,sha256=ZjOPBBkeyTZd_z1yHv_1X92T_7QonM1dMT7iPhpgiOM,326647
 psychopy/app/locale/ko_KR/LC_MESSAGE/messages.mo,sha256=aH0Bw3Wg0KaxWPYu9pNfA8zLizw2fCg6YP191aL63Us,561
 psychopy/app/locale/ko_KR/LC_MESSAGE/messages.po,sha256=Og8xPQ0fmSCKOMp-rFBiPDAACi56C8LdjH7mFuVTwoA,719
 psychopy/app/locale/ms_MY/LC_MESSAGE/messages.mo,sha256=IbykycFb3cwbl7OOa9-iJemo7ep92PiV5pEtPse4SrA,2213
@@ -1017,7 +1017,7 @@ psychopy/app/plugin_manager/__init__.py,sha256=bSD1HYo2TXCFMith4-erfzv_PHP6p-qhB
 psychopy/app/plugin_manager/dialog.py,sha256=YW5OfmQ79cPOZ40Vx1yctKy5gDth4Q4qQw1VOw4Dm_I,15102
 psychopy/app/plugin_manager/output.py,sha256=BUfmvr7EGkDJlj97wku-GKI_vhzx2mNGCAepUHlzyRc,4045
 psychopy/app/plugin_manager/packages.py,sha256=gykd4LcQJVU5jexhYsoQDeplXBpFo1GQOOS_Yzmz56Q,20072
-psychopy/app/plugin_manager/plugins.py,sha256=ode_ST9o-VcW3sTRQ7NM4ElE3oVJQKnmwY1sthzgF-M,47525
+psychopy/app/plugin_manager/plugins.py,sha256=1ULbiIG89uVE9qvuBgI00-XwZWvD-J5k7V_2PilKj3s,47705
 psychopy/app/plugin_manager/utils.py,sha256=2xEcau7amzOXs9P2QZbLeuvN_437ttyCWYCKC-lCGG4,4267
 psychopy/app/preferencesDlg.py,sha256=Y476Y_GRp2FUOtZL8o3u2ktVoNPNx3B6fpsxnfJ70Es,32028
 psychopy/app/psychopyApp.py,sha256=71Hn-zIRzukQmFhN4H6UMCTf6DQFE5eQ8JdFIMaeh0o,3369
@@ -1169,7 +1169,7 @@ psychopy/demos/builder/Feature Demos/noise/noise.psyexp,sha256=awd_ocUQyLKDrcX8o
 psychopy/demos/builder/Feature Demos/noise/readme.md,sha256=380VfNp6kH-rwYvf2-MafaFPEV98xi9B0XuRQQUwgs0,121
 psychopy/demos/builder/Feature Demos/panorama/panImg.jpg,sha256=oOlPPTaGBVsiMZ3iBHFO7k1JDZRRMRGsok9CGEtOULE,14084972
 psychopy/demos/builder/Feature Demos/panorama/panorama.psyexp,sha256=P-3WLaKPXEsSMkgiGvv6rEWmmTh6RXhv1z_eCfLMyyo,10578
-psychopy/demos/builder/Feature Demos/progress/progressBar.psyexp,sha256=W-jOKd6EOy-zVgn16O0khGov2qP2yUhBDoCAMQ7woDE,31782
+psychopy/demos/builder/Feature Demos/progress/progressBar.psyexp,sha256=m5jQrfb61APm32KvzdpXvHZnn2HpsZRxo0XAbeJoRKs,31782
 psychopy/demos/builder/Feature Demos/progress/readme.md,sha256=eMIuawrNMyfOzV9-BNvmfYHWAD9hjsjaNWqf_BMuxQE,264
 psychopy/demos/builder/Feature Demos/sliders/README.md,sha256=DESTwlzvnTKU7Pmtx26E5L3McMLjeJv4z_TfjrzX9tU,394
 psychopy/demos/builder/Feature Demos/sliders/fruitConditions.xlsx,sha256=XVronDakp0VkWNB_dMDwLBR8CmIUa44CYZcyajeOq80,11587
@@ -1357,7 +1357,7 @@ psychopy/experiment/components/button/dark/button.png,sha256=SBAbSgqTPCYaAZTZUzL
 psychopy/experiment/components/button/dark/button@2x.png,sha256=rOaQQiDzIod3CJOS-9QB03FG3ftNTc0qYxwn2hAgnVU,2189
 psychopy/experiment/components/button/light/button.png,sha256=96qG9x_4BgTmLhlrEJgG5NnxYIKFsowgOMSX_FBg4WM,1124
 psychopy/experiment/components/button/light/button@2x.png,sha256=UaoRfEq-FAfsPW7DQ7TqXH9XEMOfKfrI2BnKTaLHx0M,2179
-psychopy/experiment/components/buttonBox/__init__.py,sha256=wezkhrhV7pESyDpz9eq4at_HJZwpIQ8wYxw0wJRfTqE,11900
+psychopy/experiment/components/buttonBox/__init__.py,sha256=-jrtsdw3FYFs-ROHLia94GQ2bDuAjFYgj4DBnfSWym4,12382
 psychopy/experiment/components/buttonBox/classic/buttonBox.png,sha256=mPWJ3fiZ9lbHMxDuC5NOOH4oXuKdApEThXfXcRro4Y4,2672
 psychopy/experiment/components/buttonBox/classic/buttonBox@2x.png,sha256=G64Vfyg4Cie1MRf_1wNN8Xr23VolKsNLLQTGXoWRn8k,6094
 psychopy/experiment/components/buttonBox/dark/buttonBox.png,sha256=G3JfdQ3zLSRTSTz0t6GfKkt7ihEhhw2AJs0u_FGTwSs,1259
@@ -1446,7 +1446,7 @@ psychopy/experiment/components/microphone/dark/microphone.png,sha256=q6XPPab-nnF
 psychopy/experiment/components/microphone/dark/microphone@2x.png,sha256=x58B_E0YQNUV2dyye52APaf-25S7nfpP70j-2-7PpLQ,1853
 psychopy/experiment/components/microphone/light/microphone.png,sha256=bQztv6e7oCUK8852Zc5RcLt_kEgqI9c_d_S8W-6WEt4,988
 psychopy/experiment/components/microphone/light/microphone@2x.png,sha256=swrycVelLJd8k57jbaS5AYXq5ievFSs-rhsNePv_rQM,1841
-psychopy/experiment/components/mouse/__init__.py,sha256=4dSvLs6h2aZirBRTflbwgpi2GqP_LFfBU4jiEhTG1aE,34264
+psychopy/experiment/components/mouse/__init__.py,sha256=pT5xrJxpOhiZEUKrbkPBFgTGG_yA6xgsDYmZj9dNqUE,34739
 psychopy/experiment/components/mouse/classic/mouse.png,sha256=rXSJ4vFYekhNjANSuJnLdLmCF0-Y6p6s8b7JyL6It9Y,3735
 psychopy/experiment/components/mouse/classic/mouse@2x.png,sha256=Ms-piLdbP1zKFBP5bbiBb7sF_Bps67GG7ZpBnItxoNM,11310
 psychopy/experiment/components/mouse/dark/mouse.png,sha256=KWXV2z5bUx80lwu3H98-8h2XWo9ZyQvM3iRU22CQ7z8,772
@@ -1487,7 +1487,7 @@ psychopy/experiment/components/polygon/dark/polygon.png,sha256=6ZCyor1NM4i7kLpXy
 psychopy/experiment/components/polygon/dark/polygon@2x.png,sha256=GVoiBNpjoSPRFIKoqc542SyWssn53exU3qyPqtRYD2w,1608
 psychopy/experiment/components/polygon/light/polygon.png,sha256=D2UXeVnUpQIEL4vizve-T93NckPTHu8_jDeRZPPAvLU,890
 psychopy/experiment/components/polygon/light/polygon@2x.png,sha256=NAmC9ZRAEgG1CZIdfjEEEMP0EZuPzp6i927enCtF8QM,1610
-psychopy/experiment/components/progress/__init__.py,sha256=c4-FPLGOymVwUjX7N3yzYk44dqOkzp1OUy1WONX4q7g,5516
+psychopy/experiment/components/progress/__init__.py,sha256=Xxyk3m-wbYor_kF4eR2YHyj-m1cJue4xu8rDZ65uv9g,5516
 psychopy/experiment/components/progress/classic/progress.png,sha256=Gp4am-n_1PAv8fk8W0lrHZzaIe4FkjAUMVNFjJ242Mc,1224
 psychopy/experiment/components/progress/classic/progress@2x.png,sha256=bv1QzZVgbvRXn0Hcppyk3znleGJi2mCVQVWnlXXm_RI,2394
 psychopy/experiment/components/progress/dark/progress.png,sha256=mHkbscXItnKvZY5AL8lzjjRvTDWcxr1hKJe3ibmsz-0,852
@@ -1609,7 +1609,7 @@ psychopy/experiment/questPlusTemplate.xltx,sha256=8c1yt6el4v_iE79FoelLX267TpFrPs
 psychopy/experiment/questTemplate.xltx,sha256=p0FzYmMWJH0uaGRFlAdPT4uSzNBHpV7uPM0gZN5yYds,20668
 psychopy/experiment/routines/__init__.py,sha256=mQTjLeu5H7K_EGp_WZ7I5jXDKNgPF4ViJz00aG_pV-g,3672
 psychopy/experiment/routines/_base.py,sha256=VMln_MS1QPNga64wBR0fB0pMsHu28UeyElZAuIil7pA,38584
-psychopy/experiment/routines/counterbalance/__init__.py,sha256=NuH3o-tm0aF6zlfdD1eEd0vh79zgbdHlf47tYp7CrAk,12603
+psychopy/experiment/routines/counterbalance/__init__.py,sha256=XxkGNfrQoTvuL0i80bWWYy2VANsxN7Fl93Y2C7xpc5c,12616
 psychopy/experiment/routines/counterbalance/classic/counterbalance.png,sha256=ficKpm9rX1A-YIzgFNfM6EbwAklenfKeOwP74ktCgfo,3977
 psychopy/experiment/routines/counterbalance/classic/counterbalance@2x.png,sha256=UwSvAzg0Y9k1jEtkvbzr277tApPB08o4gFRuhhN5NpA,10628
 psychopy/experiment/routines/counterbalance/counterbalanceItems.xltx,sha256=Ht1ZE6c800RGF1LxE6WjWGujNwsMQ04pw6j_VZu86uE,18707
@@ -1636,7 +1636,7 @@ psychopy/experiment/routines/pavlovia_survey/dark/survey.png,sha256=YHJAx4LHLurS
 psychopy/experiment/routines/pavlovia_survey/dark/survey@2x.png,sha256=avsdFSmD-qy_Mnj-NMacvECqw4BEqeC9aRFSxf9sRYU,3947
 psychopy/experiment/routines/pavlovia_survey/light/survey.png,sha256=ojzaoqGK6qIehsj2ElkHEq1J526YZBcGtqlDgQD0LqI,2141
 psychopy/experiment/routines/pavlovia_survey/light/survey@2x.png,sha256=0S0VB_qSJjiBJNtNVb9oQChCFb9HCwvb8j1K76ERf4E,3969
-psychopy/experiment/routines/photodiodeValidator/__init__.py,sha256=DE3OHRrzVGQZTnXy_88BC-8HKy65cbfzMOsTBoIjQwI,15899
+psychopy/experiment/routines/photodiodeValidator/__init__.py,sha256=tOf6TXE6mnHQPYTfWJK-TT4AqsEhreXOWkRE59S6rFg,15919
 psychopy/experiment/routines/photodiodeValidator/classic/photodiode_validator.png,sha256=P9XtMKUVN-xKXqf7OgTvfjzJfTq0WgYEJu3vLR1_DT0,4837
 psychopy/experiment/routines/photodiodeValidator/classic/photodiode_validator@2x.png,sha256=pLoUU7IzKlZ_uOHA_0xA0ZXRa7Np7ocXMS8c8EGW4U8,13416
 psychopy/experiment/routines/photodiodeValidator/dark/photodiode_validator.png,sha256=yg85iyoPTMm34XBvPeak3ZKK0aXoqQkWnkFGK5xdDhc,1690
@@ -1683,7 +1683,7 @@ psychopy/hardware/forp.py,sha256=P19o4cmrZD4kHhJwNT0kj5LR-F4kdwXSu5GpYyiis4U,135
 psychopy/hardware/gammasci.py,sha256=odRzQ1kKduDqrQshp582YtKnXnSFPXWc8qic9jjPZMc,1000
 psychopy/hardware/iolab.py,sha256=8fqy-xGe15naHLgYfxELpes5ooNDTUytLTTz9_NhTi0,1067
 psychopy/hardware/joystick/__init__.py,sha256=wBhX_21kRPAlKM2UyEZBYBKhDCfiLHIp-K7r_2bDorI,19109
-psychopy/hardware/keyboard.py,sha256=SCMaOrRwwz5jVZwH-0g7IOa7D1CAFfwNNJk9w6e19Gg,34160
+psychopy/hardware/keyboard.py,sha256=jjsTdovR7m0--XkkCFeM74J1fODua4Issmx71DJXPUI,34208
 psychopy/hardware/knownDevices.json,sha256=rGsTu0MaBdUTUA6bwCKU9D-J03i0oFPDWOw28Eu4Ik0,1791
 psychopy/hardware/labhackers.py,sha256=_fRtMUtSd5f2DXRVgVsXQdF3x9ZDFypXcuxaD0J1C0E,864
 psychopy/hardware/labjacks.py,sha256=CQfxgty2uGdG2bzkcbfw-pKBzxHlnSSVfcPHKlsOC8E,980
@@ -2744,17 +2744,18 @@ psychopy/tests/test_experiment/needs_wx/test_Experiment.py,sha256=HpN-2uiKFitW6y
 psychopy/tests/test_experiment/needs_wx/test_components.py,sha256=nr06cyK0vPbJVOFXESx5Q5ehjKI9i669HbS6cJDzlGA,7092
 psychopy/tests/test_experiment/test_component_compile_js.py,sha256=LrVUQ-izAN23e5M1t3Tg7NaourscsDABSBtPZeEWm24,2775
 psychopy/tests/test_experiment/test_component_compile_python.py,sha256=SALVfXswwu64hyfIsqzPhDru5EVO5tyuUDAOLrXDE10,7002
-psychopy/tests/test_experiment/test_components/__init__.py,sha256=EdYXBYmZlZcMS0LtpZpGIIE7fa0MBka2QLCPvkiFo1I,78
-psychopy/tests/test_experiment/test_components/test_ButtonBox.py,sha256=DRlb5ZteA3owgNqa29c-sKdIfqBt2HxCaRbAa-eymxg,7347
-psychopy/tests/test_experiment/test_components/test_Code.py,sha256=wmFAzpk4SXzLp7Hhatm6MaZEpYPni2HTgoezxPgZG-k,4044
-psychopy/tests/test_experiment/test_components/test_Image.py,sha256=h8rdATikkkkoS8EOem4y_sb0jAnSPnGSxPvkCfANXUk,1057
-psychopy/tests/test_experiment/test_components/test_Mouse.py,sha256=3dhAT7nRfg8aK6ePASBmr6mnGlyZX7HKYB3Ozd54_X4,8609
-psychopy/tests/test_experiment/test_components/test_Polygon.py,sha256=qc3gwI2rze6fzNUbIg8dRaXacQJWlEokfkLo3QE6BK8,3588
-psychopy/tests/test_experiment/test_components/test_ResourceManager.py,sha256=CPozNSM4s9rulbijBlnViS8dhmsa0DjziG8VG7f4s3Q,3040
-psychopy/tests/test_experiment/test_components/test_Settings.py,sha256=iFwD6xN0KZHs5C09OD97OzBwFSec1E5KY3M4KpjO3Ys,3493
-psychopy/tests/test_experiment/test_components/test_Static.py,sha256=wpGpwm8r4vxJA4gIIAwVL3PPcwsMt0narkVmeKL0xJI,2955
-psychopy/tests/test_experiment/test_components/test_all_components.py,sha256=Kc39UU4NJw5uyFO0DR5TEDI-pdRopW68yR9muQvIDcU,7280
-psychopy/tests/test_experiment/test_components/test_base_components.py,sha256=H_VXPo5ul524U9lt7okfAttW9taL0GxAmD8xbrxH8_c,14389
+psychopy/tests/test_experiment/test_components/__init__.py,sha256=qQqf5031kA1-Qcj4ActVGQbE6wB4DQQ2JpdBnf4e7Sc,52
+psychopy/tests/test_experiment/test_components/test_ButtonBoxComponent.py,sha256=sG_M3v97JIrFvpDGRYn7Y21--zvzpQkPTtEnsXspBPk,6748
+psychopy/tests/test_experiment/test_components/test_CodeComponent.py,sha256=8U4Z2FDhn6Gf1DRnOAEEScl47gFHWz1-6_nhAiQwrkI,3460
+psychopy/tests/test_experiment/test_components/test_GratingComponent.py,sha256=zdaSZhd-XAkihUBt7mnq93QEuEDniUeRxE0LHWl98Qo,363
+psychopy/tests/test_experiment/test_components/test_ImageComponent.py,sha256=oFlxj67_r5H68VF84FcGa8rrgBxTo81lURS9L6mBSpA,366
+psychopy/tests/test_experiment/test_components/test_MouseComponent.py,sha256=2pFUhxQmCWBeUvaUxWaayEDFfgkIOP8CtzWP3o2e4UI,7876
+psychopy/tests/test_experiment/test_components/test_PolygonComponent.py,sha256=wXaGVfe-qERMcgtRexFofpjsBjR4WdWKBFtPIBut8Wo,2954
+psychopy/tests/test_experiment/test_components/test_ResourceManagerComponent.py,sha256=n-mB_VoTn3PxUWETjggyU5yvh56k4xQQMYruOy2ScM0,2533
+psychopy/tests/test_experiment/test_components/test_SettingsComponent.py,sha256=hdcoBh8u9X4si97L8naTz7Ix2rzlHK4FpP52-hDYENY,3338
+psychopy/tests/test_experiment/test_components/test_StaticComponent.py,sha256=Ta0gzNMN-lqE77iyQ6z0eR_71ijNlGhSr01IFaiHJoE,2434
+psychopy/tests/test_experiment/test_components/test_all_components.py,sha256=O-7fSqlk-oaTK4HC65_lsDv0sTF4xQ9p0P3uXoenMzc,4403
+psychopy/tests/test_experiment/test_components/test_base_components.py,sha256=StKDjDX8Hg88s_znEpD6ivZlz4Fxuvm_UWiS38dJv_k,17849
 psychopy/tests/test_experiment/test_experiment.py,sha256=WRWimiyviyzkPc85PuqTumrVrbrZe0yB95WYraGXLsw,4439
 psychopy/tests/test_experiment/test_loops.py,sha256=8-lHo7nAXaiorP_hpv2oSyA_UZAt2617L3CyusrIUCs,3703
 psychopy/tests/test_experiment/test_params.py,sha256=e2WjO4T1xvb0sRtZXph9CAcN3YjIN79hzziTiqoEu8o,13172
@@ -2773,7 +2774,7 @@ psychopy/tests/test_hardware/test_CRS_bitsShaders.py,sha256=zjzFyA6K889xdIzExY0-
 psychopy/tests/test_hardware/test_device_manager.py,sha256=iLbRKaiR_fVaPob6Pj2p7pSGRJkHU2OTdUyfRIQD4jo,1240
 psychopy/tests/test_hardware/test_emulator.py,sha256=3JlvxVM6SlqWRQYITI2XkjOjd_wMtaWvajkFMerichE,4227
 psychopy/tests/test_hardware/test_gammasci.py,sha256=bwoesGbNHzcwz6x3wNqXPu4Ahk0PzSzpXsK-KK2c2xw,1140
-psychopy/tests/test_hardware/test_keyboard.py,sha256=JEdlSFd0B67p-kTnKqSvJPF5hxw-uCYHBbgsjuP85us,2421
+psychopy/tests/test_hardware/test_keyboard.py,sha256=iL_3m1zQ1XfmAoujvM4ZRJ6yHLexpd_6HbqSyGJ1nKU,7244
 psychopy/tests/test_hardware/test_keyboard_events.py,sha256=z_-ERHgMMtMs_AaCLWllOz8dm1IGg-_qjJyJuiLYkeo,10995
 psychopy/tests/test_hardware/test_ports.py,sha256=jvwP1tboaxySZUmGyKFb7SdDPXziVI_ky3_rw0BHvm8,4934
 psychopy/tests/test_iohub/__init__.py,sha256=XWwudbQJpOsGyIVAq5MW_kkSE6pvoG4D6ztzdVIvL-I,19
@@ -2915,7 +2916,7 @@ psychopy/visual/panorama.py,sha256=8B96YTS5lxMoFO1feUaCLEXD7oERR3J0Pr4Kgi2UJdM,1
 psychopy/visual/patch.py,sha256=UMD6JG1WuM1PK7Lam679tbyUltXxWbvd1IdIqwGbreQ,1007
 psychopy/visual/pie.py,sha256=oIgisD1x1TmKHxLautG89cnbleaGUqSZVejuYDFl6VQ,9732
 psychopy/visual/polygon.py,sha256=ldp7bcj3vobHZwoVt2WfVsXEL078x-Y339IEJD84-zI,9444
-psychopy/visual/progress.py,sha256=zWEW1A21znqgmljTXBSt-kpLCWtjTRBxUQp1KsIOppo,10661
+psychopy/visual/progress.py,sha256=VH6W9pcZG5PXKrga7YTV6ugeiGM8kNXNc5Bmio4mciY,10661
 psychopy/visual/radial.py,sha256=kraRjPnrkhhJ9V5w3qJUVZQwIWgwpXXBqBpmZn8NMU8,1288
 psychopy/visual/ratingscale.py,sha256=6BGdR0neA-HI4b32qwVaFUM-2RNSib-9KSpjtokqVaY,65386
 psychopy/visual/rect.py,sha256=PNjf2CJsAAR1hdwdCA6swG5QokzHAG6sL9AITgihEDM,8555
@@ -2946,5 +2947,5 @@ psychopy/voicekey/labjack_vks.py,sha256=PPTpdAON8I7zdPevls8SIMH9_ZfJ14gSL01A5UVD
 psychopy/voicekey/parallel_vks.py,sha256=I6a07GvN0Q2k9xidl9YbEUDORG2v9l2H_5Owbpw_xzY,1464
 psychopy/voicekey/signal.py,sha256=Mk363qVsvJampVDfsOTdGq7lPESlKmogmNFqasdghJE,1013
 psychopy/voicekey/vk_tools.py,sha256=pFvOvF9b9CfS-JkZ_fv38LxI59hJXQqiz9ymcrJiAFc,8483
-psychopy/web.py,sha256=ohiFb7lW1-0pH_62cR-z8ufZ5Nta2jRIjGS4_zosX_U,10228
-psychopy-2024.1.2.dist-info/RECORD,,
+psychopy/web.py,sha256=TaN6joXx_NmyMUP6NqLYk66yMMUV2nlSEPGByPqvzFM,10328
+psychopy-2024.1.4.dist-info/RECORD,,

{psychopy-2024.1.2.dist-info → psychopy-2024.1.4.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: pdm-backend (2.2.1)
+Generator: pdm-backend (2.3.0)
 Root-Is-Purelib: true
 Tag: py3-none-any

psychopy/tests/test_experiment/test_components/test_Image.py

@@ -1,24 +0,0 @@
-from psychopy.experiment import Experiment
-from psychopy.experiment.components.image import ImageComponent
-from psychopy.experiment.loops import TrialHandler
-from psychopy.experiment.routines import Routine
-from .test_base_components import _TestDepthMixin, _TestBaseComponentsMixin
-from psychopy.visual.image import ImageStim
-
-
-class TestImage(_TestBaseComponentsMixin, _TestDepthMixin):
-    libraryClass = ImageStim
-
-    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 = ImageComponent(exp=self.exp, parentName="testRoutine", name="testImage")
-        self.routine.addComponent(self.comp)