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

psychopy/GIT_SHA

@@ -1 +1 @@
-21e8c98452ff86f45dcc22206bef29647fe6a0da
+872d0a686f2d3765ef56ac771ab7d4291f735839

psychopy/VERSION

@@ -1 +1 @@
-2024.2.0
+2024.2.1

psychopy/app/Resources/routine_templates/Trials.psyexp

@@ -482,7 +482,7 @@
         <Param val="" valType="code" updates="None" name="durationEstim"/>
         <Param val="False" valType="bool" updates="constant" name="flipHoriz"/>
         <Param val="False" valType="bool" updates="constant" name="flipVert"/>
-        <Param val="default.png" valType="file" updates="set during: Images_2AFC.ISI_load_images" name="image"/>
+        <Param val="default.png" valType="file" updates="set during: images_2afc.ISI_load_images" name="image"/>
         <Param val="linear" valType="str" updates="constant" name="interpolate"/>
         <Param val="" valType="str" updates="constant" name="mask"/>
         <Param val="left_img" valType="code" updates="None" name="name"/>
@@ -522,7 +522,7 @@
         <Param val="" valType="code" updates="None" name="durationEstim"/>
         <Param val="False" valType="bool" updates="constant" name="flipHoriz"/>
         <Param val="False" valType="bool" updates="constant" name="flipVert"/>
-        <Param val="default.png" valType="file" updates="set during: Images_2AFC.ISI_load_images" name="image"/>
+        <Param val="default.png" valType="file" updates="set during: images_2afc.ISI_load_images" name="image"/>
         <Param val="linear" valType="str" updates="constant" name="interpolate"/>
         <Param val="" valType="str" updates="constant" name="mask"/>
         <Param val="right_img" valType="code" updates="None" name="name"/>
@@ -598,7 +598,7 @@
         <Param val="" valType="code" updates="None" name="durationEstim"/>
         <Param val="False" valType="bool" updates="constant" name="flipHoriz"/>
         <Param val="False" valType="bool" updates="constant" name="flipVert"/>
-        <Param val="default.png" valType="file" updates="set during: Images_2AFC.ISI_load_images" name="image"/>
+        <Param val="default.png" valType="file" updates="set during: images_2afc.ISI_load_images" name="image"/>
         <Param val="linear" valType="str" updates="constant" name="interpolate"/>
         <Param val="" valType="str" updates="constant" name="mask"/>
         <Param val="top_left_img" valType="code" updates="None" name="name"/>
@@ -638,7 +638,7 @@
         <Param val="" valType="code" updates="None" name="durationEstim"/>
         <Param val="False" valType="bool" updates="constant" name="flipHoriz"/>
         <Param val="False" valType="bool" updates="constant" name="flipVert"/>
-        <Param val="default.png" valType="file" updates="set during: Images_2AFC.ISI_load_images" name="image"/>
+        <Param val="default.png" valType="file" updates="set during: images_2afc.ISI_load_images" name="image"/>
         <Param val="linear" valType="str" updates="constant" name="interpolate"/>
         <Param val="" valType="str" updates="constant" name="mask"/>
         <Param val="top_right_img" valType="code" updates="None" name="name"/>
@@ -665,7 +665,7 @@
         <Param val="" valType="code" updates="None" name="durationEstim"/>
         <Param val="False" valType="bool" updates="constant" name="flipHoriz"/>
         <Param val="False" valType="bool" updates="constant" name="flipVert"/>
-        <Param val="default.png" valType="file" updates="set during: Images_2AFC.ISI_load_images" name="image"/>
+        <Param val="default.png" valType="file" updates="set during: images_2afc.ISI_load_images" name="image"/>
         <Param val="linear" valType="str" updates="constant" name="interpolate"/>
         <Param val="" valType="str" updates="constant" name="mask"/>
         <Param val="bott_left_img" valType="code" updates="None" name="name"/>

psychopy/app/locale/es_CO/LC_MESSAGE/messages.po

@@ -14,7 +14,7 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 3.4.2\n"
+"X-Generator: Poedit 3.4.4\n"
 "X-Poedit-Basepath: ../../../../..\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 "X-Poedit-KeywordsList: _translate\n"
@@ -23,7 +23,7 @@ msgstr ""
 #: psychopy/alerts/alertsCatalogue/alertmsg.py:12
 #, python-brace-format
 msgid "Your stimulus size exceeds the {dimension} dimension of your window."
-msgstr "El tamaño de su estímulo excede la dimensión{dimension} de su ventana."
+msgstr "El tamaño de su estímulo excede la dimensión {dimension} de su ventana."
 
 #: psychopy/alerts/alertsCatalogue/alertmsg.py:16
 #, python-brace-format
@@ -145,8 +145,7 @@ msgstr ""
 
 #: psychopy/alerts/alertsCatalogue/alertmsg.py:94
 msgid "Experiment includes components or routines which use eyetracking, but no eye tracker is configured."
-msgstr ""
-"El experimento incluye componentes o rutinas que utilizan seguimiento ocular, pero ningún rastreador ocular se ha configurado."
+msgstr "El experimento incluye componentes o rutinas que utilizan rastreo ocular, pero ningún rastreador ocular se ha configurado."
 
 #: psychopy/alerts/alertsCatalogue/alertmsg.py:98
 #, python-brace-format
@@ -170,15 +169,15 @@ msgstr "Los Eyetrackers de {brand} no admiten ritmo manual"
 #: psychopy/alerts/alertsCatalogue/alertmsg.py:108
 msgid "Window mode is set to be windowed, but eyetracking requires the window to be full screen."
 msgstr ""
-"El modo de ventana está configurado para ser en ventana, pero el seguimiento ocular requiere que la ventana sea pantalla completa."
+"El modo de ventana está configurado para ser en ventana, pero el rastreo ocular requiere que la ventana sea pantalla completa."
 
 #: psychopy/alerts/alertsCatalogue/alertmsg.py:112
 msgid "A monitor config is required for accurate eyetracking measurements, but none was found."
-msgstr "Se requiere una configuración de monitor para mediciones precisas de seguimiento ocular, pero ninguna ha sido encontrada."
+msgstr "Se requiere una configuración de monitor para mediciones precisas de rastreo ocular, pero ninguna ha sido encontrada."
 
 #: psychopy/alerts/alertsCatalogue/alertmsg.py:116
 msgid "Eye tracker experiments should use 'ioHub' as the Input -> Keyboard Backend setting"
-msgstr "Los experimentos de seguimiento ocular deben usar 'ioHub' como entrada -> Backend del tecladoconfiguración"
+msgstr "Los experimentos de rastreo ocular deben usar 'ioHub' como entrada -> Configuración del Backend del teclado"
 
 #: psychopy/alerts/alertsCatalogue/alertmsg.py:120
 #, python-brace-format
@@ -1472,7 +1471,7 @@ msgstr "Formateando"
 
 #: psychopy/app/builder/localizedStrings.py:39
 msgid "Eyetracking"
-msgstr "Seguimiento ocular"
+msgstr "Rastreo ocular"
 
 #: psychopy/app/builder/localizedStrings.py:40
 msgid "Target"
@@ -5367,7 +5366,7 @@ msgstr "Botones permitidos"
 #: psychopy/experiment/components/joyButtons/__init__.py:17 psychopy/experiment/components/joyButtons/__init__.py:74
 #: psychopy/experiment/components/keyboard/__init__.py:22 psychopy/experiment/components/keyboard/__init__.py:100
 msgid "Store"
-msgstr "Tienda"
+msgstr "Almacenar"
 
 #: psychopy/experiment/components/joyButtons/__init__.py:19 psychopy/experiment/components/joyButtons/__init__.py:90
 #: psychopy/experiment/components/keyboard/__init__.py:24 psychopy/experiment/components/keyboard/__init__.py:116
@@ -5456,7 +5455,7 @@ msgstr "Joystick: consultar posición y botones del joystick"
 msgid ""
 "How often should the joystick state (x,y,buttons) be stored? On every video frame, every click or just at the end of the Routine?"
 msgstr ""
-"¿Con qué frecuencia se debe almacenar el estado del joystick (botones x,y)? En cada vídeocuadro, ¿cada clic o simplemente al "
+"¿Con qué frecuencia se debe almacenar el estado del joystick (botones x,y)? En cada cuadro del video, ¿cada clic o simplemente al "
 "final de la rutina?"
 
 #: psychopy/experiment/components/joystick/__init__.py:67 psychopy/experiment/components/mouse/__init__.py:65
@@ -6724,7 +6723,7 @@ msgstr "Puerto GazePoint"
 
 #: psychopy/experiment/components/settings/__init__.py:508 psychopy/experiment/components/settings/__init__.py:578
 msgid "Eye tracker model."
-msgstr "Modelo de seguimiento ocular."
+msgstr "Modelo de Rastreador Ocular."
 
 #: psychopy/experiment/components/settings/__init__.py:509 psychopy/experiment/components/settings/__init__.py:579
 msgid "Model name"
@@ -6752,7 +6751,7 @@ msgstr "Seleccione con ojo(s) para rastrear."
 
 #: psychopy/experiment/components/settings/__init__.py:529
 msgid "Track eyes"
-msgstr "Ojos de seguimiento"
+msgstr "Rastrear ojos"
 
 #: psychopy/experiment/components/settings/__init__.py:535
 msgid "Filter eye sample data live, as it is streamed to the driving device. This may reduce the sampling speed."
@@ -6774,11 +6773,11 @@ msgstr "Filtrado de muestra guardada"
 
 #: psychopy/experiment/components/settings/__init__.py:551
 msgid "Track Pupil-CR or Pupil only."
-msgstr "Seguimiento de Pupil-CR o Pupil solamente."
+msgstr "Rastreo de Pupila-CR o Pupila solamente."
 
 #: psychopy/experiment/components/settings/__init__.py:552
 msgid "Pupil tracking mode"
-msgstr "Modo de seguimiento de pupila"
+msgstr "Modo de rastreo de pupila"
 
 #: psychopy/experiment/components/settings/__init__.py:558
 msgid "Algorithm used to detect the pupil center."

psychopy/app/locale/es_ES/LC_MESSAGE/messages.po

@@ -23,7 +23,7 @@ msgstr ""
 #: psychopy/alerts/alertsCatalogue/alertmsg.py:12
 #, python-brace-format
 msgid "Your stimulus size exceeds the {dimension} dimension of your window."
-msgstr "El tamaño de su estímulo excede la dimensión{dimension} de su ventana."
+msgstr "El tamaño de su estímulo excede la dimensión {dimension} de su ventana."
 
 #: psychopy/alerts/alertsCatalogue/alertmsg.py:16
 #, python-brace-format
@@ -145,8 +145,7 @@ msgstr ""
 
 #: psychopy/alerts/alertsCatalogue/alertmsg.py:94
 msgid "Experiment includes components or routines which use eyetracking, but no eye tracker is configured."
-msgstr ""
-"El experimento incluye componentes o rutinas que utilizan seguimiento ocular, pero ningún rastreador ocular se ha configurado."
+msgstr "El experimento incluye componentes o rutinas que utilizan rastreo ocular, pero ningún rastreador ocular se ha configurado."
 
 #: psychopy/alerts/alertsCatalogue/alertmsg.py:98
 #, python-brace-format
@@ -170,15 +169,15 @@ msgstr "Los Eyetrackers de {brand} no admiten ritmo manual"
 #: psychopy/alerts/alertsCatalogue/alertmsg.py:108
 msgid "Window mode is set to be windowed, but eyetracking requires the window to be full screen."
 msgstr ""
-"El modo de ventana está configurado para ser en ventana, pero el seguimiento ocular requiere que la ventana sea pantalla completa."
+"El modo de ventana está configurado para ser en ventana, pero el rastreo ocular requiere que la ventana sea pantalla completa."
 
 #: psychopy/alerts/alertsCatalogue/alertmsg.py:112
 msgid "A monitor config is required for accurate eyetracking measurements, but none was found."
-msgstr "Se requiere una configuración de monitor para mediciones precisas de seguimiento ocular, pero ninguna ha sido encontrada."
+msgstr "Se requiere una configuración de monitor para mediciones precisas de rastreo ocular, pero ninguna ha sido encontrada."
 
 #: psychopy/alerts/alertsCatalogue/alertmsg.py:116
 msgid "Eye tracker experiments should use 'ioHub' as the Input -> Keyboard Backend setting"
-msgstr "Los experimentos de seguimiento ocular deben usar 'ioHub' como entrada -> Backend del tecladoconfiguración"
+msgstr "Los experimentos de rastreo ocular deben usar 'ioHub' como entrada -> Configuración del Backend del teclado"
 
 #: psychopy/alerts/alertsCatalogue/alertmsg.py:120
 #, python-brace-format
@@ -1474,7 +1473,7 @@ msgstr "Formateando"
 
 #: psychopy/app/builder/localizedStrings.py:39
 msgid "Eyetracking"
-msgstr "Seguimiento ocular"
+msgstr "Rastreo ocular"
 
 #: psychopy/app/builder/localizedStrings.py:40
 msgid "Target"
@@ -5369,7 +5368,7 @@ msgstr "Botones permitidos"
 #: psychopy/experiment/components/joyButtons/__init__.py:17 psychopy/experiment/components/joyButtons/__init__.py:74
 #: psychopy/experiment/components/keyboard/__init__.py:22 psychopy/experiment/components/keyboard/__init__.py:100
 msgid "Store"
-msgstr "Tienda"
+msgstr "Almacenar"
 
 #: psychopy/experiment/components/joyButtons/__init__.py:19 psychopy/experiment/components/joyButtons/__init__.py:90
 #: psychopy/experiment/components/keyboard/__init__.py:24 psychopy/experiment/components/keyboard/__init__.py:116
@@ -5458,7 +5457,7 @@ msgstr "Joystick: consultar posición y botones del joystick"
 msgid ""
 "How often should the joystick state (x,y,buttons) be stored? On every video frame, every click or just at the end of the Routine?"
 msgstr ""
-"¿Con qué frecuencia se debe almacenar el estado del joystick (botones x,y)? En cada vídeocuadro, ¿cada clic o simplemente al "
+"¿Con qué frecuencia se debe almacenar el estado del joystick (botones x,y)? En cada cuadro del video, ¿cada clic o simplemente al "
 "final de la rutina?"
 
 #: psychopy/experiment/components/joystick/__init__.py:67 psychopy/experiment/components/mouse/__init__.py:65
@@ -6726,7 +6725,7 @@ msgstr "Puerto GazePoint"
 
 #: psychopy/experiment/components/settings/__init__.py:508 psychopy/experiment/components/settings/__init__.py:578
 msgid "Eye tracker model."
-msgstr "Modelo de seguimiento ocular."
+msgstr "Modelo de Rastreador Ocular."
 
 #: psychopy/experiment/components/settings/__init__.py:509 psychopy/experiment/components/settings/__init__.py:579
 msgid "Model name"
@@ -6754,7 +6753,7 @@ msgstr "Seleccione con ojo(s) para rastrear."
 
 #: psychopy/experiment/components/settings/__init__.py:529
 msgid "Track eyes"
-msgstr "Ojos de seguimiento"
+msgstr "Rastrear ojos"
 
 #: psychopy/experiment/components/settings/__init__.py:535
 msgid "Filter eye sample data live, as it is streamed to the driving device. This may reduce the sampling speed."
@@ -6776,11 +6775,11 @@ msgstr "Filtrado de muestra guardada"
 
 #: psychopy/experiment/components/settings/__init__.py:551
 msgid "Track Pupil-CR or Pupil only."
-msgstr "Seguimiento de Pupil-CR o Pupil solamente."
+msgstr "Rastreo de Pupila-CR o Pupila solamente."
 
 #: psychopy/experiment/components/settings/__init__.py:552
 msgid "Pupil tracking mode"
-msgstr "Modo de seguimiento de pupila"
+msgstr "Modo de rastreo de pupila"
 
 #: psychopy/experiment/components/settings/__init__.py:558
 msgid "Algorithm used to detect the pupil center."

psychopy/app/locale/es_US/LC_MESSAGE/messages.po

@@ -23,7 +23,7 @@ msgstr ""
 #: psychopy/alerts/alertsCatalogue/alertmsg.py:12
 #, python-brace-format
 msgid "Your stimulus size exceeds the {dimension} dimension of your window."
-msgstr "El tamaño de su estímulo excede la dimensión{dimension} de su ventana."
+msgstr "El tamaño de su estímulo excede la dimensión {dimension} de su ventana."
 
 #: psychopy/alerts/alertsCatalogue/alertmsg.py:16
 #, python-brace-format
@@ -145,8 +145,7 @@ msgstr ""
 
 #: psychopy/alerts/alertsCatalogue/alertmsg.py:94
 msgid "Experiment includes components or routines which use eyetracking, but no eye tracker is configured."
-msgstr ""
-"El experimento incluye componentes o rutinas que utilizan seguimiento ocular, pero ningún rastreador ocular se ha configurado."
+msgstr "El experimento incluye componentes o rutinas que utilizan rastreo ocular, pero ningún rastreador ocular se ha configurado."
 
 #: psychopy/alerts/alertsCatalogue/alertmsg.py:98
 #, python-brace-format
@@ -170,15 +169,15 @@ msgstr "Los Eyetrackers de {brand} no admiten ritmo manual"
 #: psychopy/alerts/alertsCatalogue/alertmsg.py:108
 msgid "Window mode is set to be windowed, but eyetracking requires the window to be full screen."
 msgstr ""
-"El modo de ventana está configurado para ser en ventana, pero el seguimiento ocular requiere que la ventana sea pantalla completa."
+"El modo de ventana está configurado para ser en ventana, pero el rastreo ocular requiere que la ventana sea pantalla completa."
 
 #: psychopy/alerts/alertsCatalogue/alertmsg.py:112
 msgid "A monitor config is required for accurate eyetracking measurements, but none was found."
-msgstr "Se requiere una configuración de monitor para mediciones precisas de seguimiento ocular, pero ninguna ha sido encontrada."
+msgstr "Se requiere una configuración de monitor para mediciones precisas de rastreo ocular, pero ninguna ha sido encontrada."
 
 #: psychopy/alerts/alertsCatalogue/alertmsg.py:116
 msgid "Eye tracker experiments should use 'ioHub' as the Input -> Keyboard Backend setting"
-msgstr "Los experimentos de seguimiento ocular deben usar 'ioHub' como entrada -> Backend del tecladoconfiguración"
+msgstr "Los experimentos de rastreo ocular deben usar 'ioHub' como entrada -> Configuración del Backend del teclado"
 
 #: psychopy/alerts/alertsCatalogue/alertmsg.py:120
 #, python-brace-format
@@ -1472,7 +1471,7 @@ msgstr "Formateando"
 
 #: psychopy/app/builder/localizedStrings.py:39
 msgid "Eyetracking"
-msgstr "Seguimiento ocular"
+msgstr "Rastreo ocular"
 
 #: psychopy/app/builder/localizedStrings.py:40
 msgid "Target"
@@ -5367,7 +5366,7 @@ msgstr "Botones permitidos"
 #: psychopy/experiment/components/joyButtons/__init__.py:17 psychopy/experiment/components/joyButtons/__init__.py:74
 #: psychopy/experiment/components/keyboard/__init__.py:22 psychopy/experiment/components/keyboard/__init__.py:100
 msgid "Store"
-msgstr "Tienda"
+msgstr "Almacenar"
 
 #: psychopy/experiment/components/joyButtons/__init__.py:19 psychopy/experiment/components/joyButtons/__init__.py:90
 #: psychopy/experiment/components/keyboard/__init__.py:24 psychopy/experiment/components/keyboard/__init__.py:116
@@ -5456,7 +5455,7 @@ msgstr "Joystick: consultar posición y botones del joystick"
 msgid ""
 "How often should the joystick state (x,y,buttons) be stored? On every video frame, every click or just at the end of the Routine?"
 msgstr ""
-"¿Con qué frecuencia se debe almacenar el estado del joystick (botones x,y)? En cada vídeocuadro, ¿cada clic o simplemente al "
+"¿Con qué frecuencia se debe almacenar el estado del joystick (botones x,y)? En cada cuadro del video, ¿cada clic o simplemente al "
 "final de la rutina?"
 
 #: psychopy/experiment/components/joystick/__init__.py:67 psychopy/experiment/components/mouse/__init__.py:65
@@ -6724,7 +6723,7 @@ msgstr "Puerto GazePoint"
 
 #: psychopy/experiment/components/settings/__init__.py:508 psychopy/experiment/components/settings/__init__.py:578
 msgid "Eye tracker model."
-msgstr "Modelo de seguimiento ocular."
+msgstr "Modelo de Rastreador Ocular."
 
 #: psychopy/experiment/components/settings/__init__.py:509 psychopy/experiment/components/settings/__init__.py:579
 msgid "Model name"
@@ -6752,7 +6751,7 @@ msgstr "Seleccione con ojo(s) para rastrear."
 
 #: psychopy/experiment/components/settings/__init__.py:529
 msgid "Track eyes"
-msgstr "Ojos de seguimiento"
+msgstr "Rastrear ojos"
 
 #: psychopy/experiment/components/settings/__init__.py:535
 msgid "Filter eye sample data live, as it is streamed to the driving device. This may reduce the sampling speed."
@@ -6774,11 +6773,11 @@ msgstr "Filtrado de muestra guardada"
 
 #: psychopy/experiment/components/settings/__init__.py:551
 msgid "Track Pupil-CR or Pupil only."
-msgstr "Seguimiento de Pupil-CR o Pupil solamente."
+msgstr "Rastreo de Pupila-CR o Pupila solamente."
 
 #: psychopy/experiment/components/settings/__init__.py:552
 msgid "Pupil tracking mode"
-msgstr "Modo de seguimiento de pupila"
+msgstr "Modo de rastreo de pupila"
 
 #: psychopy/experiment/components/settings/__init__.py:558
 msgid "Algorithm used to detect the pupil center."

psychopy/data/trial.py

@@ -1070,6 +1070,15 @@ class TrialHandler2(_BaseTrialHandler):
 
     next = __next__  # allows user to call without a loop `val = trials.next()`
 
+    @property
+    def thisIndex(self):
+        if self.thisTrial is None:
+            if len(self.elapsedTrials):
+                return self.elapsedTrials[-1].thisIndex
+            else:
+                return -1
+        return self.thisTrial.thisIndex
+
     @property
     def thisN(self):
         if self.thisTrial is None:
@@ -1108,7 +1117,7 @@ class TrialHandler2(_BaseTrialHandler):
         # start off at 0 trial
         thisTrialN = 0
         thisN = 0
-        thisRepN = 0
+        thisRepN = -1
         # empty array to store indices once taken
         prevIndices = []
         # empty array to store remaining indices

psychopy/experiment/components/movie/__init__.py

@@ -274,6 +274,17 @@ class MovieComponent(BaseVisualComponent):
         """
         buff.writeIndented("\n")
         buff.writeIndented("# *%s* updates\n" % self.params['name'])
+
+        # set parameters that need updating every frame
+        # do any params need updating? (this method inherited from _base)
+        if self.checkNeedToUpdate('set every frame'):
+            code = "if %(name)s.status == STARTED:  # only update if being drawn\n" % self.params
+            buff.writeIndented(code)
+
+            buff.setIndentLevel(+1, relative=True)  # to enter the if block
+            self.writeParamUpdates(buff, 'set every frame')
+            buff.setIndentLevel(-1, relative=True)  # to exit the if block
+
         # writes an if statement to determine whether to draw etc
         indented = self.writeStartTestCode(buff)
         if indented:
@@ -286,7 +297,8 @@ class MovieComponent(BaseVisualComponent):
         # because of the 'if' statement of the time test
         buff.setIndentLevel(-indented, relative=True)
 
-        indented = self.writeStopTestCode(buff)
+        # write code for stopping
+        indented = self.writeStopTestCode(buff, extra=" or %(name)s.isFinished")
         if indented:
             code = (
                 "%(name)s.setAutoDraw(False)\n"
@@ -296,15 +308,7 @@ class MovieComponent(BaseVisualComponent):
             buff.writeIndentedLines(code % self.params)
         # to get out of the if statement
         buff.setIndentLevel(-indented, relative=True)
-        # set parameters that need updating every frame
-        # do any params need updating? (this method inherited from _base)
-        if self.checkNeedToUpdate('set every frame'):
-            code = "if %(name)s.status == STARTED:  # only update if being drawn\n" % self.params
-            buff.writeIndented(code)
 
-            buff.setIndentLevel(+1, relative=True)  # to enter the if block
-            self.writeParamUpdates(buff, 'set every frame')
-            buff.setIndentLevel(-1, relative=True)  # to exit the if block
         # do force end of trial code
         if self.params['forceEndRoutine'].val is True:
             code = ("if %s.isFinished:  # force-end the Routine\n"

psychopy/iohub/__init__.py

@@ -5,6 +5,7 @@
 # Distributed under the terms of the GNU General Public License (GPL).
 
 import sys
+import platform
 from .errors import print2err, printExceptionDetailsToStdErr
 from .util import module_directory
 
@@ -20,13 +21,17 @@ def _localFunc():
 
 IOHUB_DIRECTORY = module_directory(_localFunc)
 
-_DATA_STORE_AVAILABLE = False
 try:
     import tables
     _DATA_STORE_AVAILABLE = True
-except ImportError:
+except ModuleNotFoundError:
     print2err('WARNING: pytables package not found. ',
-              'ioHub hdf5 datastore functionality will be disabled.')
+            'ioHub hdf5 datastore functionality will be disabled.')
+    _DATA_STORE_AVAILABLE = False
+except ImportError:
+    print2err('WARNING: pytables package failed to load. ',
+            'ioHub hdf5 datastore functionality will be disabled.')
+    _DATA_STORE_AVAILABLE = False
 except Exception:
     printExceptionDetailsToStdErr()
 

psychopy/tests/data/corrRandomTH2.csv

@@ -1,16 +1,16 @@
-trialType,thisN,thisTrialN,thisRepN,resp,rand
-1,0,0,1,resp1,0.543404942
-2,1,1,1,resp2,0.278369385
-4,2,2,1,resp4,0.424517591
-3,3,3,1,resp3,0.844776132
-0,4,4,1,resp0,0.004718856
-2,5,0,2,resp2,0.121569121
-4,6,1,2,resp4,0.670749085
-1,7,2,2,resp1,0.825852755
-3,8,3,2,resp3,0.13670659
-0,9,4,2,resp0,0.575093329
-3,10,0,3,resp3,0.891321954
-0,11,1,3,resp0,0.209202122
-4,12,2,3,resp4,0.18532822
-1,13,3,3,resp1,0.10837689
-2,14,4,3,resp2,0.219697493
+trialType,thisN,thisTrialN,thisRepN,resp,rand
+1,0,0,0,resp1,0.543404942
+2,1,1,0,resp2,0.278369385
+4,2,2,0,resp4,0.424517591
+3,3,3,0,resp3,0.844776132
+0,4,4,0,resp0,0.004718856
+2,5,0,1,resp2,0.121569121
+4,6,1,1,resp4,0.670749085
+1,7,2,1,resp1,0.825852755
+3,8,3,1,resp3,0.13670659
+0,9,4,1,resp0,0.575093329
+3,10,0,2,resp3,0.891321954
+0,11,1,2,resp0,0.209202122
+4,12,2,2,resp4,0.18532822
+1,13,3,2,resp1,0.10837689
+2,14,4,2,resp2,0.219697493

psychopy/tests/test_data/test_TrialHandler2.py

@@ -28,6 +28,26 @@ class TestTrialHandler2:
 
     def teardown_class(self):
         shutil.rmtree(self.temp_dir)
+    
+    def test_th1_indexing_unchanged(self):
+        """
+        Checks that indexing style is the same for TrialHandler2 as TrialHandler
+        """
+        # make both trial handlers
+        th1 = data.trial.TrialHandler(self.conditions, nReps=3, method="sequential")
+        th2 = data.trial.TrialHandler2(self.conditions, nReps=3, method="sequential")
+        # start a trials loop
+        for n in range(9):
+            # iterate trial
+            th1.next()
+            th2.next()
+            # make sure thisN is the same
+            for attr in ("thisN", "thisIndex", "thisRepN", "thisTrialN"):
+                assert getattr(th1, attr) == getattr(th2, attr), (
+                    f"Expected `.{attr}` to be the same between TrialHandler and TrialHandler2, "
+                    f"but on iteration {n} got {getattr(th1, attr)} for TrialHandler and "
+                    f"{getattr(th2, attr)} for TrialHandler2."
+                )
 
     def test_underscores_in_datatype_names2(self):
         trials = data.TrialHandler2([], 1, autoLog=False)
@@ -299,12 +319,12 @@ class TestTrialHandler2:
         t.__next__()
         # define array of answers
         answers = [
-            {'thisN': 5, 'thisRepN': 2, 'thisTrialN': 2, 'thisIndex': 2},
-            {'thisN': 1, 'thisRepN': 1, 'thisTrialN': 1, 'thisIndex': 1},
-            {'thisN': 2, 'thisRepN': 1, 'thisTrialN': 2, 'thisIndex': 2},
-            {'thisN': 3, 'thisRepN': 2, 'thisTrialN': 0, 'thisIndex': 0},
-            {'thisN': 4, 'thisRepN': 2, 'thisTrialN': 1, 'thisIndex': 1},
-            {'thisN': 5, 'thisRepN': 2, 'thisTrialN': 2, 'thisIndex': 2},
+            {'thisN': 5, 'thisRepN': 1, 'thisTrialN': 2, 'thisIndex': 2},
+            {'thisN': 1, 'thisRepN': 0, 'thisTrialN': 1, 'thisIndex': 1},
+            {'thisN': 2, 'thisRepN': 0, 'thisTrialN': 2, 'thisIndex': 2},
+            {'thisN': 3, 'thisRepN': 1, 'thisTrialN': 0, 'thisIndex': 0},
+            {'thisN': 4, 'thisRepN': 1, 'thisTrialN': 1, 'thisIndex': 1},
+            {'thisN': 5, 'thisRepN': 1, 'thisTrialN': 2, 'thisIndex': 2},
             None,
         ]
         # get future trials
@@ -333,16 +353,16 @@ class TestTrialHandler2:
         # some values to move forwards/backwards by and the values at that point
         cases = [
             # move backwards and forwards and check we land in the right place
-            (+4, {'thisN': 4, 'thisRepN': 2, 'thisTrialN': 1, 'thisIndex': 1}),
-            (-1, {'thisN': 3, 'thisRepN': 2, 'thisTrialN': 0, 'thisIndex': 0}),
-            (-3, {'thisN': 0, 'thisRepN': 1, 'thisTrialN': 0, 'thisIndex': 0}),
-            (+2, {'thisN': 2, 'thisRepN': 1, 'thisTrialN': 2, 'thisIndex': 2}),
-            (-1, {'thisN': 1, 'thisRepN': 1, 'thisTrialN': 1, 'thisIndex': 1}),
-            (+2, {'thisN': 3, 'thisRepN': 2, 'thisTrialN': 0, 'thisIndex': 0}),
+            (+4, {'thisN': 4, 'thisRepN': 1, 'thisTrialN': 1, 'thisIndex': 1}),
+            (-1, {'thisN': 3, 'thisRepN': 1, 'thisTrialN': 0, 'thisIndex': 0}),
+            (-3, {'thisN': 0, 'thisRepN': 0, 'thisTrialN': 0, 'thisIndex': 0}),
+            (+2, {'thisN': 2, 'thisRepN': 0, 'thisTrialN': 2, 'thisIndex': 2}),
+            (-1, {'thisN': 1, 'thisRepN': 0, 'thisTrialN': 1, 'thisIndex': 1}),
+            (+2, {'thisN': 3, 'thisRepN': 1, 'thisTrialN': 0, 'thisIndex': 0}),
             # move back past the start and check we land at the start
-            (-10, {'thisN': 0, 'thisRepN': 1, 'thisTrialN': 0, 'thisIndex': 0}),
+            (-10, {'thisN': 0, 'thisRepN': 0, 'thisTrialN': 0, 'thisIndex': 0}),
             # move forwards past the end and check we land at the end
-            (+10, {'thisN': 5, 'thisRepN': 2, 'thisTrialN': 2, 'thisIndex': 2}),
+            (+10, {'thisN': 5, 'thisRepN': 1, 'thisTrialN': 2, 'thisIndex': 2}),
         ]
         # iterate through cases
         for inc, answer in cases:

{psychopy-2024.2.0.dist-info → psychopy-2024.2.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: psychopy
-Version: 2024.2.0
+Version: 2024.2.1
 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>
@@ -71,9 +71,7 @@ Requires-Dist: pyobjc; platform_system == "Darwin"
 Requires-Dist: zeroconf; platform_system == "Darwin"
 Requires-Dist: python-xlib; platform_system == "Linux"
 Requires-Dist: distro; platform_system == "Linux"
-Requires-Dist: tables<3.9; python_version < "3.9"
-Requires-Dist: tables; python_version >= "3.9"
-Requires-Dist: blosc2<2.2.8; python_version < "3.9"
+Requires-Dist: tables!=3.9.2
 Requires-Dist: packaging>=24.1
 Requires-Dist: pytest>=6.2.5; extra == "tests"
 Requires-Dist: pytest-codecov; extra == "tests"
@@ -110,6 +108,12 @@ Description-Content-Type: text/markdown
 
 ---
 
+**Announcement!!**
+
+We are excited to announce that PsychoPy will be hosting a 3-day in-person code-sprint at the University of Nottingham from 15-17 April 2024. The code sprint will be an opportunity for us to get together in person and improve PsychoPy/JS. Anyone who would like to attend will need to fill out the [online application](https://run.pavlovia.org/pavlovia/survey/?surveyId=171ed328-d5ea-4819-83dc-9ba00ef5683b) by 31 January 2024. Those selected will be notified by the end of February.
+
+---
+
 PsychoPy is an open-source package for creating experiments in behavioral science. It aims to provide a single package that is:
 
 * precise enough for psychophysics