psychopy 2025.1.0__tar.gz → 2025.1.1__tar.gz

{psychopy-2025.1.0 → psychopy-2025.1.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: psychopy
-Version: 2025.1.0
+Version: 2025.1.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>
@@ -17,7 +17,7 @@ Classifier: License :: OSI Approved :: GNU General Public License v3 or later (G
 Project-URL: Homepage, https://www.psychopy.org/
 Project-URL: Download, https://github.com/psychopy/psychopy/releases/
 Requires-Python: <3.11,>=3.8
-Requires-Dist: numpy<2.0
+Requires-Dist: numpy
 Requires-Dist: scipy
 Requires-Dist: matplotlib
 Requires-Dist: pyglet==1.4.11; platform_system == "Windows"
@@ -31,7 +31,7 @@ Requires-Dist: xmlschema
 Requires-Dist: soundfile
 Requires-Dist: imageio
 Requires-Dist: imageio-ffmpeg
-Requires-Dist: psychtoolbox; platform_machine != "arm64"
+Requires-Dist: psychtoolbox<3.0.20; platform_machine != "arm64"
 Requires-Dist: pywinhook; platform_system == "Windows"
 Requires-Dist: gevent
 Requires-Dist: MeshPy
@@ -65,9 +65,9 @@ Requires-Dist: opencv-python
 Requires-Dist: python-vlc==3.0.11115; platform_system == "Windows"
 Requires-Dist: python-vlc>=3.0.12118; platform_system != "Windows"
 Requires-Dist: pypiwin32; platform_system == "Windows"
-Requires-Dist: pyobjc-core; platform_system == "Darwin"
+Requires-Dist: pyobjc-core<8.0; platform_system == "Darwin"
 Requires-Dist: pyobjc-framework-Quartz<8.0; platform_system == "Darwin"
-Requires-Dist: pyobjc; platform_system == "Darwin"
+Requires-Dist: pyobjc<8.0; platform_system == "Darwin"
 Requires-Dist: zeroconf; platform_system == "Darwin"
 Requires-Dist: python-xlib; platform_system == "Linux"
 Requires-Dist: distro; platform_system == "Linux"
@@ -87,6 +87,7 @@ Requires-Dist: sphinx; extra == "docs"
 Requires-Dist: sphinx-design; extra == "docs"
 Requires-Dist: sphinx-copybutton; extra == "docs"
 Requires-Dist: jinja2; extra == "docs"
+Requires-Dist: psychopy-sphinx-theme; extra == "docs"
 Provides-Extra: building
 Requires-Dist: bdist-mpkg>=0.5.0; platform_system == "Darwin" and extra == "building"
 Requires-Dist: py2app; platform_system == "Darwin" and extra == "building"

psychopy-2025.1.1/psychopy/VERSION

@@ -0,0 +1 @@
+2025.1.1

{psychopy-2025.1.0 → psychopy-2025.1.1}/psychopy/colors.py

@@ -261,7 +261,6 @@ class Color:
         self._cache = {}
         self._renderCache = {}
         self.contrast = contrast if isinstance(contrast, (int, float)) else 1
-        self.alpha = 1
         self.valid = False
         self.conematrix = conematrix
 
@@ -398,7 +397,7 @@ class Color:
         """If colour is printed, it will display its class and value.
         """
         if self.valid:
-            if self.named:
+            if isinstance(self.named, str):
                 return (f"<{self.__class__.__module__}."
                         f"{self.__class__.__name__}: {self.named}, "
                         f"alpha={self.alpha}>")
@@ -537,12 +536,18 @@ class Color:
         """How opaque (1) or transparent (0) this color is. Synonymous with
         `opacity`.
         """
-        return self._alpha
+        if hasattr(self, "_alpha"):
+            return self._alpha
+
+        return 1
 
     @alpha.setter
     def alpha(self, value):
-        # Treat 1x1 arrays as a float
-        if isinstance(value, np.ndarray):
+        if value is None:
+            # setting as None should do nothing
+            return
+        elif isinstance(value, np.ndarray):
+            # treat 1x1 arrays as a float
             if value.size == 1:
                 value = float(value[0])
         else:

{psychopy-2025.1.0 → psychopy-2025.1.1}/psychopy/data/utils.py

@@ -389,7 +389,7 @@ def importConditions(fileName, returnFieldNames=False, selection=""):
                     if val.startswith('[') and val.endswith(']'):
                         # val = eval('%s' %unicode(val.decode('utf8')))
                         val = eval(val)
-                elif type(val) == np.string_:
+                elif type(val) == np.bytes_:
                     val = str(val.decode('utf-8-sig'))
                     # if it looks like a list, convert it:
                     if val.startswith('[') and val.endswith(']'):

{psychopy-2025.1.0 → psychopy-2025.1.1}/psychopy/hardware/camera/__init__.py

@@ -679,7 +679,7 @@ class CameraInterfaceFFmpeg(CameraInterface):
                 Barrier which is used to synchronize audio and video recording.
                 This ensures that the audio device is ready before buffering 
                 frames captured by the camera. 
-            audioCapture : psychopy.sound.Microphone or None
+            audioCapture : psychopy.sound.microphone.Microphone or None
                 Microphone object to use for audio capture. This will be used to
                 synchronize the audio and video streams. If `None`, no audio
                 will be captured.
@@ -1153,7 +1153,7 @@ class CameraInterfaceOpenCV(CameraInterface):
                 Barrier which is used to synchronize audio and video recording.
                 This ensures that the audio device is ready before buffering 
                 frames captured by the camera. 
-            audioCapture : psychopy.sound.Microphone or None
+            audioCapture : psychopy.sound.microphone.Microphone or None
                 Microphone object to use for audio capture. This will be used to
                 synchronize the audio and video streams. If `None`, no audio
                 will be captured.

{psychopy-2025.1.0 → psychopy-2025.1.1}/psychopy/hardware/microphone.py

@@ -89,7 +89,7 @@ class MicrophoneDevice(BaseDevice, aliases=["mic", "microphone"]):
     Capture 10 seconds of audio from the primary microphone::
 
         import psychopy.core as core
-        import psychopy.sound.Microphone as Microphone
+        import psychopy.sound.microphone.Microphone as Microphone
 
         mic = Microphone(bufferSecs=10.0)  # open the microphone
         mic.start()  # start recording

{psychopy-2025.1.0 → psychopy-2025.1.1}/psychopy/iohub/devices/eyetracker/hw/gazepoint/__init__.py

@@ -9,6 +9,7 @@ try:
     from psychopy_eyetracker_gazepoint.gazepoint.gp3 import (
         __file__,
         EyeTracker, 
+        GazepointSampleEvent,
         MonocularEyeSampleEvent,
         BinocularEyeSampleEvent, 
         FixationStartEvent,
@@ -16,8 +17,7 @@ try:
         SaccadeStartEvent,
         SaccadeEndEvent, 
         BlinkStartEvent,
-        BlinkEndEvent,
-        GazepointSampleEvent
+        BlinkEndEvent
     )
 except (ModuleNotFoundError, ImportError, NameError):
     logging.error(

{psychopy-2025.1.0 → psychopy-2025.1.1}/psychopy/iohub/devices/eyetracker/hw/gazepoint/gp3/__init__.py

@@ -9,6 +9,7 @@ try:
     from psychopy_eyetracker_gazepoint.gazepoint.gp3 import (
         __file__,
         EyeTracker, 
+        GazepointSampleEvent,
         MonocularEyeSampleEvent,
         BinocularEyeSampleEvent, 
         FixationStartEvent,

{psychopy-2025.1.0 → psychopy-2025.1.1}/psychopy/iohub/devices/eyetracker/hw/gazepoint/gp3/eyetracker.py

@@ -17,5 +17,15 @@ except (ModuleNotFoundError, ImportError, NameError):
         "'psychopy-eyetracker-gazepoint' to be installed. Please install this "
         "package and restart the session to enable support.")
 
+# sample event for this device was moved to the plugin, but we're going to use
+# the original class for compatibility with older plugin versions
+try:
+    from psychopy_eyetracker_gazepoint.gazepoint.gp3.eyetracker import (
+        GazepointSampleEvent)
+except (ModuleNotFoundError, ImportError, NameError):
+    # import it from the old iohub location
+    from ....eye_events import GazepointSampleEvent
+
+
 if __name__ == "__main__":
     pass

{psychopy-2025.1.0 → psychopy-2025.1.1}/psychopy/tools/gltools.py

@@ -121,7 +121,6 @@ __all__ = [
     'createTexImage2D',
     'createTexImage2dFromFile',
     'bindTexture',
-    'unbindTexture',
     'createCubeMap',
     'TexCubeMap',
     'getModelViewMatrix',
@@ -405,7 +404,10 @@ def getOpenGLInfo():
 
 
 # OpenGL limits for this system
-MAX_TEXTURE_UNITS = getOpenGLInfo().maxTextureUnits
+try:
+    MAX_TEXTURE_UNITS = getOpenGLInfo().maxTextureUnits
+except:
+    MAX_TEXTURE_UNITS = 32
 
 
 # -------------------------------

{psychopy-2025.1.0 → psychopy-2025.1.1}/psychopy/visual/helpers.py

@@ -216,7 +216,9 @@ def setColor(obj, color, colorSpace=None, operation='',
     raw = color
     color = colors.Color(raw, colorSpace)
     assert color.valid, f"Could not create valid Color object from value {raw} in space {colorSpace}"
-
+    # set opacity from object if not given by color
+    if hasattr(obj, "opacity") and not hasattr(color, "_alpha"):
+        color.alpha = obj.opacity
     # Apply new value
     if operation in ('=', '', None):
         # If no operation, just set color from object

{psychopy-2025.1.0 → psychopy-2025.1.1}/psychopy/visual/window.py

@@ -2724,7 +2724,7 @@ class Window():
 
         if fileExt in ['.gif', '.mpg', '.mpeg', '.mp4', '.mov']:
             # lazy loading of moviepy.editor (rarely needed)
-            from moviepy.editor import ImageSequenceClip
+            from moviepy import ImageSequenceClip
             # save variety of movies with moviepy
             numpyFrames = []
             for frame in self.movieFrames:

{psychopy-2025.1.0 → psychopy-2025.1.1}/pyproject.toml

@@ -22,7 +22,7 @@ classifiers = [
     "License :: OSI Approved :: GNU General Public License v3 or later (GPLv3+)",
 ]
 dependencies = [
-    "numpy<2.0",
+    "numpy",
     "scipy",
     "matplotlib",
     "pyglet == 1.4.11; platform_system == \"Windows\"",
@@ -36,7 +36,7 @@ dependencies = [
     "soundfile",
     "imageio",
     "imageio-ffmpeg",
-    "psychtoolbox; platform_machine!='arm64'",
+    "psychtoolbox<3.0.20; platform_machine!='arm64'",
     "pywinhook; platform_system == \"Windows\"",
     "gevent",
     "MeshPy",
@@ -70,9 +70,9 @@ dependencies = [
     "python-vlc == 3.0.11115; platform_system == \"Windows\"",
     "python-vlc >= 3.0.12118; platform_system != \"Windows\"",
     "pypiwin32; platform_system == \"Windows\"",
-    "pyobjc-core; platform_system == \"Darwin\"",
+    "pyobjc-core < 8.0; platform_system == \"Darwin\"",
     "pyobjc-framework-Quartz < 8.0; platform_system == \"Darwin\"",
-    "pyobjc; platform_system == \"Darwin\"",
+    "pyobjc < 8.0; platform_system == \"Darwin\"",
     "zeroconf; platform_system == \"Darwin\"",
     "python-xlib; platform_system == \"Linux\"",
     "distro; platform_system == \"Linux\"",
@@ -81,7 +81,7 @@ dependencies = [
     "moviepy",
     "pyarrow",
 ]
-version = "2025.1.0"
+version = "2025.1.1"
 
 [project.readme]
 file = "README.md"
@@ -101,6 +101,7 @@ docs = [
     "sphinx-design",
     "sphinx-copybutton",
     "jinja2",
+    "psychopy-sphinx-theme",
 ]
 building = [
     "bdist-mpkg>=0.5.0; platform_system == \"Darwin\"",

psychopy-2025.1.0/psychopy/VERSION

@@ -1 +0,0 @@
-2025.1.0