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

psychopy/app/plugin_manager/dialog.py

@@ -68,7 +68,6 @@ class EnvironmentManagerDlg(wx.Dialog):
 
         self.notebook.ChangeSelection(0)
 
-
     @staticmethod
     def getPackageVersionInfo(packageName):
         """Query packages for available versions.
@@ -278,10 +277,13 @@ class EnvironmentManagerDlg(wx.Dialog):
             )
         else:
             command.append('--user')
-        
+
         # add other options to the command
         command += ['--prefer-binary', '--no-input', '--no-color']
-            
+
+        # disable pip version check
+        command += ['--disable-pip-version-check']
+
         # write command to output panel
         self.output.writeCmd(" ".join(command))
         # append own name to extra
@@ -359,7 +361,7 @@ class EnvironmentManagerDlg(wx.Dialog):
         # write installation termination statement
         msg = "Installation complete"
         if 'pipname' in self.pipProcess.extra:
-            msg = f"Finished installing %(pipname)s" % self.pipProcess.extra
+            msg = "Finished installing %(pipname)s" % self.pipProcess.extra
         self.output.writeTerminus(msg)
 
         # if we have a plugin, write additional plugin information post-install
@@ -411,12 +413,12 @@ class EnvironmentManagerDlg(wx.Dialog):
         # refresh view
         pkgtools.refreshPackages()
         self.pluginMgr.updateInfo()
-    
+
     def onUninstallExit(self, pid, exitCode):
         # write installation termination statement
         msg = "Uninstall complete"
         if 'pipname' in self.pipProcess.extra:
-            msg = f"Finished uninstalling %(pipname)s" % self.pipProcess.extra
+            msg = "Finished uninstalling %(pipname)s" % self.pipProcess.extra
         self.output.writeTerminus(msg)
         # clear pip process
         self.pipProcess = None
@@ -435,7 +437,7 @@ class EnvironmentManagerDlg(wx.Dialog):
             # if they change their mind, cancel closing
             if dlg.ShowModal() == wx.ID_NO:
                 return
-        
+
         if evt is not None:
             evt.Skip()
 

psychopy/app/ribbon.py

@@ -467,7 +467,8 @@ class FrameRibbonButton(wx.Button, handlers.ThemeMixin):
         wx.Button.__init__(self, parent, style=wx.BORDER_NONE | style, size=(w, 44))
         self.SetMinSize((40, 44))
         # set label
-        self.SetLabelText(label)
+        if label and style | wx.BU_NOTEXT != style:
+            self.SetLabelText(label)
         # set tooltip
         if tooltip and style | wx.BU_NOTEXT == style:
             # if there's no label, include it in the tooltip

psychopy/app/runner/runner.py

@@ -684,11 +684,13 @@ class RunnerPanel(wx.Panel, ScriptProcess, handlers.ThemeMixin):
         # get relevant paths
         htmlPath = str(self.currentFile.parent / self.outputPath)
         jsFile = self.currentFile.parent / (self.currentFile.stem + ".js")
-        # make sure JS file exists
-        if not os.path.exists(jsFile):
-            generateScript(outfile=str(jsFile),
-                           exp=self.loadExperiment(),
-                           target="PsychoJS")
+        # regenerate JS file
+        if self.currentFile.suffix == ".psyexp":
+            generateScript(
+                outfile=str(jsFile),
+                exp=self.loadExperiment(),
+                target="PsychoJS"
+            )
         # start server
         self.startServer(htmlPath, port=port)
         # open experiment

psychopy/clock.py

@@ -332,14 +332,18 @@ class Clock(MonotonicClock):
         self._epochTimeAtLastReset -= t
 
     def add(self, t):
-        """DEPRECATED: use .addTime() instead
+        """
+        DEPRECATED: use .addTime() instead
 
         This function adds time TO THE BASE (t0) which, counterintuitively,
         reduces the apparent time on the clock
         """
-        logging.warning("DEPRECATED: Clock.add() is deprecated in favor of .addTime() due to "
-                        "the counterintuitive design (it added time to the baseline, which "
-                        "reduced the values returned from getTime()")
+        psychopy.logging.log(msg=(
+            "Clock.add() is deprecated in favor of .addTime() due to the counterintuitive design "
+            "(it added time to the baseline, which reduced the values returned from getTime() )"
+            ),
+            level=psychopy.logging.DEPRECATION
+        )
         self._timeAtLastReset += t
         self._epochTimeAtLastReset += t
 

psychopy/core.py.orig

@@ -0,0 +1,169 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+"""Basic functions, including timing, rush (imported), quit
+"""
+# Part of the PsychoPy library
+# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2021 Open Science Tools Ltd.
+# Distributed under the terms of the GNU General Public License (GPL).
+
+import sys
+import threading
+import subprocess
+import shlex
+import locale
+
+# some things are imported just to be accessible within core's namespace
+from psychopy.clock import (MonotonicClock, Clock, CountdownTimer,
+                            wait, monotonicClock, getAbsTime,
+                            StaticPeriod)  # pylint: disable=W0611
+
+# always safe to call rush, even if its not going to do anything for a
+# particular OS
+from psychopy.platform_specific import rush  # pylint: disable=W0611
+from psychopy import logging
+<<<<<<< HEAD
+from psychopy.constants import STARTED, NOT_STARTED, FINISHED
+=======
+from psychopy.constants import STARTED, NOT_STARTED, FINISHED, PY3
+from psychopy.iohub.client import ioHubConnection
+>>>>>>> c06fff3cf5e2f418f6db297fd47819041a00c07d
+
+try:
+    import pyglet
+    havePyglet = True
+    # may not want to check, to preserve terminal window focus
+    checkPygletDuringWait = True
+except ImportError:
+    havePyglet = False
+    checkPygletDuringWait = False
+
+try:
+    import glfw
+    haveGLFW = True
+except ImportError:
+    haveGLFW = False
+
+runningThreads = []  # just for backwards compatibility?
+openWindows = []  # visual.Window updates this, event.py and clock.py use it
+
+# Set getTime in core to == the monotonicClock instance created in the
+# clockModule.
+# The logging module sets the defaultClock to == clock.monotonicClock,
+# so by default the core.getTime() and logging.defaultClock.getTime()
+# functions return the 'same' timebase.
+#
+# This way 'all' OSs have a core.getTime() timebase that starts at 0.0 when
+# the experiment is launched, instead of it being this way on Windows only
+# (which was also a descripancy between OS's when win32 was using time.clock).
+
+
+def getTime(applyZero = True):
+    """Get the current time since psychopy.core was loaded.
+
+
+
+    Version Notes: Note that prior to PsychoPy 1.77.00 the behaviour of
+    getTime() was platform dependent (on OSX and linux it was equivalent to
+    :func:`psychopy.core.getAbsTime`
+    whereas on windows it returned time since loading of the module, as now)
+    """
+    return monotonicClock.getTime(applyZero)
+
+
+def quit():
+    """Close everything and exit nicely (ending the experiment)
+    """
+    # pygame.quit()  # safe even if pygame was never initialised
+    logging.flush()
+
+    # properly shutdown ioHub server
+    if ioHubConnection.ACTIVE_CONNECTION:
+        ioHubConnection.ACTIVE_CONNECTION.quit()
+
+    for thisThread in threading.enumerate():
+        if hasattr(thisThread, 'stop') and hasattr(thisThread, 'running'):
+            # this is one of our event threads - kill it and wait for success
+            thisThread.stop()
+            while thisThread.running == 0:
+                pass  # wait until it has properly finished polling
+
+    sys.exit(0)  # quits the python session entirely
+
+
+def shellCall(shellCmd, stdin='', stderr=False, env=None, encoding=None):
+    """Call a single system command with arguments, return its stdout.
+    Returns stdout, stderr if stderr is True.
+    Handles simple pipes, passing stdin to shellCmd (pipes are untested
+    on windows) can accept string or list as the first argument
+
+    Parameters
+    ----------
+    shellCmd : str, or iterable
+        The command to execute, and its respective arguments.
+
+    stdin : str, or None
+        Input to pass to the command.
+
+    stderr : bool
+        Whether to return the standard error output once execution is finished.
+
+    env : dict
+        The environment variables to set during execution.
+
+    encoding : str
+        The encoding to use for communication with the executed command.
+        This argument will be ignored on Python 2.7.
+
+    Notes
+    -----
+    We use ``subprocess.Popen`` to execute the command and establish
+    `stdin` and `stdout` pipes.
+    Python 2.7 always opens the pipes in text mode; however,
+    Python 3 defaults to binary mode, unless an encoding is specified.
+    To unify pipe communication across Python 2 and 3, we now provide an
+    `encoding` parameter, enforcing `utf-8` text mode by default.
+    This parameter is present from Python 3.6 onwards; using an older
+    Python 3 version will raise an exception. The parameter will be ignored
+    when running Python 2.7.
+
+    """
+    if encoding is None:
+        encoding = locale.getpreferredencoding()
+
+    if type(shellCmd) == str:
+        # safely split into cmd+list-of-args, no pipes here
+        shellCmdList = shlex.split(shellCmd)
+    elif type(shellCmd) == bytes:
+        # safely split into cmd+list-of-args, no pipes here
+        shellCmdList = shlex.split(shellCmd.decode('utf-8'))
+    elif type(shellCmd) in (list, tuple):  # handles whitespace in filenames
+        shellCmdList = shellCmd
+    else:
+        msg = 'shellCmd requires a string or iterable.'
+        raise TypeError(msg)
+
+    cmdObjects = []
+    for obj in shellCmdList:
+        if type(obj) != bytes:
+            cmdObjects.append(obj)
+        else:
+            cmdObjects.append(obj.decode('utf-8'))
+
+    # the `encoding` parameter results in unicode coming back
+    if sys.version_info.minor >= 6:
+        proc = subprocess.Popen(cmdObjects, stdin=subprocess.PIPE,
+                                stdout=subprocess.PIPE,
+                                stderr=subprocess.PIPE,
+                                encoding=encoding, env=env)
+    else:
+        msg = 'shellCall() requires Python 2.7, or 3.6 and newer.'
+        raise RuntimeError(msg)
+
+    stdoutData, stderrData = proc.communicate(stdin)
+
+    del proc
+    if stderr:
+        return stdoutData.strip(), stderrData.strip()
+    else:
+        return stdoutData.strip()

psychopy/demos/builder/Design Templates/randomisedBlocks/html/index.html

@@ -0,0 +1,23 @@
+<!doctype html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="user-scalable=no">
+    <title>randomisedBlocks [PsychoPy]</title>
+    <!-- styles -->
+    <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/jquery-ui-dist@1.12.1/jquery-ui.min.css">
+    <link rel="stylesheet" href="./lib/psychojs-2022.2.0.css">
+  </head>
+  <body>
+    <div id="root"></div>
+    <!-- external libraries -->
+    <script src="https://cdn.jsdelivr.net/npm/jquery@3.6.0/dist/jquery.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/jquery-ui-dist@1.12.1/jquery-ui.min.js"></script>
+    <script src="https://cdn.jsdelivr.net/npm/preloadjs@1.0.1/lib/preloadjs.min.js"></script>
+    <!-- experiment -->
+    <script src="./randomisedBlocks.js" type="module"></script>
+    <!-- legacy browsers -->
+    <script src="./lib/psychojs-2022.2.0.iife.js" nomodule></script>
+    <script src="./randomisedBlocks-legacy-browsers.js" nomodule></script>
+  </body>
+</html>