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

psychopy/GIT_SHA

@@ -1 +1 @@
-872d0a686f2d3765ef56ac771ab7d4291f735839
+n/a

psychopy/VERSION

@@ -1 +1 @@
-2024.2.1
+2024.2.4

psychopy/__init__.py

@@ -53,7 +53,7 @@ if 'installing' not in locals():
         # Custom environment variable for people using PsychoPy as a library,
         # who don't want to use the custom site-packages location. If set to 1,
         # this will disable the custom site-packages location. Packages will be
-        # installed in the default, system dependent user's site-packages 
+        # installed in the default, system dependent user's site-packages
         # location.
         useDefaultSite = os.environ['PSYCHOPYNOPACKAGES'] == '1'
 
@@ -77,6 +77,15 @@ if 'installing' not in locals():
         # set user site packages
         env['PYTHONUSERBASE'] = prefs.paths['packages']
 
+        # set environment variable for pip to get egg-info of installed packages
+        if sys.platform == 'darwin':
+            # python 3.8 cannot parse the egg-info of zip-packaged dists
+            # correctly, so pip install will always install extra copies
+            # of dependencies. On python 3.10, we can force importlib to
+            # avoid this issue, but we need to use an environment variable
+            if sys.version_info >= (3, 10):
+                env['_PIP_USE_IMPORTLIB_METADATA'] = 'True'
+
         # update environment, pass this to sub-processes (e.g. pip)
         os.environ.update(env)
 

psychopy/__init__.py.orig

@@ -0,0 +1,65 @@
+#!/usr/bin/env python
+# -*- coding: utf-8 -*-
+
+# Part of the PsychoPy library
+# Copyright (C) 2002-2018 Jonathan Peirce (C) 2019-2022 Open Science Tools Ltd.
+# Distributed under the terms of the GNU General Public License (GPL).
+
+# --------------------------------------------------------------------------
+# This file is automatically generated during build (do not edit directly).
+# --------------------------------------------------------------------------
+
+import os
+import sys
+
+<<<<<<< HEAD
+__version__ = '2022.2.0dev3'
+=======
+__version__ = '2022.2.0a5'
+>>>>>>> dev
+__license__ = 'GNU GPLv3 (or more recent equivalent)'
+__author__ = 'Open Science Tools Ltd'
+__author_email__ = 'support@opensciencetools.org'
+__maintainer_email__ = 'support@opensciencetools.org'
+__url__ = 'https://www.psychopy.org/'
+__download_url__ = 'https://github.com/psychopy/psychopy/releases/'
+__git_sha__ = 'n/a'
+__build_platform__ = 'n/a'
+
+__all__ = ["gui", "misc", "visual", "core",
+           "event", "data", "sound", "microphone"]
+
+# for developers the following allows access to the current git sha from
+# their repository
+if __git_sha__ == 'n/a':
+    from subprocess import check_output, PIPE
+    # see if we're in a git repo and fetch from there
+    try:
+        thisFileLoc = os.path.split(__file__)[0]
+        output = check_output(['git', 'rev-parse', '--short', 'HEAD'],
+                              cwd=thisFileLoc, stderr=PIPE)
+    except Exception:
+        output = False
+    if output:
+        __git_sha__ = output.strip()  # remove final linefeed
+
+# update preferences and the user paths
+if 'installing' not in locals():
+    from psychopy.preferences import prefs
+    for pathName in prefs.general['paths']:
+        sys.path.append(pathName)
+
+    from psychopy.tools.versionchooser import useVersion, ensureMinimal
+
+if sys.version_info.major < 3:
+    raise ImportError("psychopy does not support Python2 installations. "
+                      "The last version to support Python2.7 was PsychoPy "
+                      "2021.2.x")
+
+# import readline here to get around an issue with sounddevice
+# issues GH-2230 GH-2344 GH-2662
+try:
+    import readline
+except ImportError:
+    pass  # all that will happen is the stderr/stdout might get redirected
+

psychopy/app/_psychopyApp.py

@@ -532,11 +532,15 @@ class PsychoPyApp(wx.App, handlers.ThemeMixin):
             if self.prefs.app['defaultView'] == 'all':
                 startView = ["builder", "coder", "runner"]
             elif self.prefs.app['defaultView'] == "last":
+                if self.prefs.appData['lastFrame'] == "both" or not self.prefs.appData['lastFrame']:
+                    self.prefs.appData['lastFrame'] = "builder-coder-runner"
                 startView = self.prefs.appData['lastFrame'].split("-")
             elif self.prefs.app['defaultView'] in ["builder", "coder", "runner"]:
                 startView = self.prefs.app['defaultView']
-            else:
-                startView = ["builder"]
+
+        if not startView:  # if we still don't have a startView then load Builder
+            startView = ["builder"]
+        
         # if specified as a single string, convert to list
         if isinstance(startView, str):
             startView = [startView]
@@ -546,7 +550,11 @@ class PsychoPyApp(wx.App, handlers.ThemeMixin):
             if arg.endswith(".psyexp"):
                 exps.append(arg)
             if arg.endswith(".py"):
-                scripts.append(arg)
+                if arg.endswith("psychopyApp.py"):
+                    # this is called erroneously when starting standalone app
+                    continue
+                else:
+                    scripts.append(arg)
             if "runner" not in startView and arg.endswith(".psyrun"):
                 runlist.append(arg)
         

psychopy/app/appData.spec

@@ -1,5 +1,5 @@
 
-lastFrame = string(default='both')
+lastFrame = string(default='builder-coder-runner')
 skipVersion=string(default='')  #skipping any updates of this version
 tipIndex = integer(default=0)
 flowSize = integer(0,2,default=2)

psychopy/app/builder/builder.py

@@ -1359,7 +1359,7 @@ class BuilderFrame(BaseAuiFrame, handlers.ThemeMixin):
         # update icons
         self.updateRunModeIcons()
         # update experiment mode
-        if self.exp is not None:
+        if self.exp is not None and self.exp.runMode != mode:
             self.exp.runMode = mode
             # mark as modified
             self.setIsModified(True)