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

psychopy/visual/secondorder.py

@@ -15,15 +15,16 @@ These are optional components that can be obtained by installing the
 
 """
 
-import psychopy.logging as logging
-
-try:
-    from psychopy_visionscience import EnvelopeGrating
-except (ModuleNotFoundError, ImportError):
-    logging.error(
-        "Support for `EnvelopeGrating` is not available this session. Please "
-        "install `psychopy-visionscience` and restart the session to enable "
-        "support.")
+from psychopy.tools.pkgtools import PluginStub
+
+
+class EnvelopeGrating(
+    PluginStub,
+    plugin="psychopy-visionscience",
+    doclink="https://psychopy.github.io/psychopy-visionscience/coder/EnvelopeGrating"
+):
+    pass
+
 
 
 class EnvelopeGrating:

psychopy/visual/shape.py

@@ -31,7 +31,6 @@ from psychopy.visual.basevisual import (
 )
 # from psychopy.visual.helpers import setColor
 import psychopy.visual
-from psychopy.contrib import tesselate
 
 pyglet.options['debug_gl'] = False
 GL = pyglet.gl
@@ -370,7 +369,12 @@ class BaseShapeStim(BaseVisualStim, DraggingMixin, ColorMixin, ContainerMixin):
         if self._borderColor != None and self.lineWidth != 0.0:
             # then draw
             GL.glLineWidth(self.lineWidth)
-            GL.glColor4f(*self._borderColor.render('rgba1'))
+            if self.opacity is not None:
+                borderRGBA = self._borderColor.render('rgba1')
+                borderRGBA[-1] = self.opacity  # override opacity
+                GL.glColor4f(*borderRGBA)
+            else:
+                GL.glColor4f(*self._borderColor.render('rgba1'))
             if self.closeShape:
                 GL.glDrawArrays(GL.GL_LINE_LOOP, 0, nVerts)
             else:
@@ -578,6 +582,7 @@ class ShapeStim(BaseShapeStim):
         # TO-DO: handle borders properly for multiloop stim like holes
         # likely requires changes in ContainerMixin to iterate over each
         # border loop
+        from psychopy.contrib import tesselate
 
         self.border = copy.deepcopy(newVertices)
         tessVertices = []  # define to keep the linter happy

psychopy/visual/text.py

@@ -242,7 +242,7 @@ class TextStim(BaseVisualStim, DraggingMixin, ForeColorMixin, ContainerMixin):
         if GL:  # because of pytest fail otherwise
             try:
                 GL.glDeleteLists(self._listID, 1)
-            except (ImportError, ModuleNotFoundError, TypeError):
+            except (ImportError, ModuleNotFoundError, TypeError, GL.lib.GLException):
                 pass  # if pyglet no longer exists
 
     @attributeSetter

psychopy/visual/textbox2/textbox2.py

@@ -69,7 +69,10 @@ debug = False
 class TextBox2(BaseVisualStim, DraggingMixin, ContainerMixin, ColorMixin):
     def __init__(self, win, text,
                  font="Open Sans",
-                 pos=(0, 0), units=None, letterHeight=None,
+                 pos=(0, 0),
+                 units=None,
+                 letterHeight=None,
+                 ori=0,
                  size=None,
                  color=(1.0, 1.0, 1.0), colorSpace='rgb',
                  fillColor=None, fillColorSpace=None,
@@ -248,6 +251,9 @@ class TextBox2(BaseVisualStim, DraggingMixin, ContainerMixin, ColorMixin):
         self._text = ''
         self.text = self.startText = text if text is not None else ""
 
+        # now that we have text, set orientation
+        self.ori = ori
+
         # Initialise arabic reshaper
         arabic_config = {'delete_harakat': False,  # if present, retain any diacritics
                          'shift_harakat_position': False}  # shift by 1 to be compatible with the bidi algorithm
@@ -472,8 +478,8 @@ class TextBox2(BaseVisualStim, DraggingMixin, ContainerMixin, ColorMixin):
         if hasattr(self, "box"):
             self.box.size = self._pos
         if hasattr(self, "contentBox"):
-            # Content box should be anchored center relative to box, but its pos needs to be relative to box's vertices, not its pos
-            self.contentBox.pos = self.pos + self.size * self.box._vertices.anchorAdjust
+            # set content box pos with offset for anchor (accounting for orientation)
+            self.contentBox.pos = self.pos + np.dot(self.size * self.box._vertices.anchorAdjust, self._rotationMatrix)
             self.contentBox._needVertexUpdate = True
         if hasattr(self, "_placeholder"):
             self._placeholder.pos = self._pos
@@ -1169,8 +1175,11 @@ class TextBox2(BaseVisualStim, DraggingMixin, ContainerMixin, ColorMixin):
             # Adjust vertices
             vertices[:, 0] = vertices[:, 0] + adjustX
 
-        # Convert the vertices to be relative to content box and set
-        self.vertices = vertices / self.contentBox._size.pix + (-0.5, 0.5)
+        # convert the vertices to be relative to content box and set
+        vertices = vertices / self.contentBox._size.pix + (-0.5, 0.5)
+        # apply orientation
+        self.vertices = (vertices * self.size).dot(self._rotationMatrix) / self.size
+
         if len(_lineBottoms):
             if self.flipVert:
                 self._lineBottoms = min(self.contentBox._vertices.pix[:, 1]) - np.array(_lineBottoms)
@@ -1187,6 +1196,20 @@ class TextBox2(BaseVisualStim, DraggingMixin, ContainerMixin, ColorMixin):
             self.glFont._dirty = False
         self._needVertexUpdate = True
 
+    @attributeSetter
+    def ori(self, value):
+        # get previous orientaiton
+        lastOri = self.__dict__.get("ori", 0)
+        # set new value
+        BaseVisualStim.ori.func(self, value)
+        # set on all boxes
+        self.box.ori = value
+        self.boundingBox.ori = value
+        self.contentBox.ori = value
+        # trigger layout if value has changed
+        if lastOri != value:
+            self._layout()
+
     def draw(self):
         """Draw the text to the back buffer"""
         # Border width

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: psychopy
-Version: 2024.1.4
+Version: 2024.2.0
 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
+Requires-Dist: numpy<2.0
 Requires-Dist: scipy
 Requires-Dist: matplotlib
 Requires-Dist: pyglet==1.4.11; platform_system == "Windows"
@@ -70,9 +70,11 @@ Requires-Dist: pyobjc-framework-Quartz<8.0; platform_system == "Darwin"
 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: packaging>=24.1
 Requires-Dist: pytest>=6.2.5; extra == "tests"
 Requires-Dist: pytest-codecov; extra == "tests"
 Requires-Dist: pytest-cov; extra == "tests"
@@ -82,11 +84,10 @@ Requires-Dist: xmlschema; extra == "tests"
 Requires-Dist: bdist-mpkg>=0.5.0; platform_system == "Darwin" and extra == "building"
 Requires-Dist: py2app; platform_system == "Darwin" and extra == "building"
 Requires-Dist: dmgbuild; platform_system == "Darwin" and extra == "building"
+Requires-Dist: sounddevice; extra == "suggested"
 Requires-Dist: pylsl>=1.16.1; extra == "suggested"
 Requires-Dist: xlwt; extra == "suggested"
 Requires-Dist: h5py; extra == "suggested"
-Requires-Dist: google-api-python-client; extra == "suggested"
-Requires-Dist: pygaze>=1.1.2; extra == "suggested"
 Requires-Dist: tobii_research; extra == "suggested"
 Requires-Dist: badapted>=0.0.3; extra == "suggested"
 Requires-Dist: egi-pynetstation>=0.0.0rc1; extra == "suggested"
@@ -109,12 +110,6 @@ 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
@@ -142,9 +137,9 @@ and the developers documentation at [https://www.psychopy.org/developers](https:
 
 ## Code Status
 
-[![Language grade: Python](https://img.shields.io/lgtm/grade/python/g/psychopy/psychopy.svg?logo=lgtm&logoWidth=18)](https://lgtm.com/projects/g/psychopy/psychopy/context:python)  
-Dev branch tests: [![GH tests](https://github.com/psychopy/psychopy/actions/workflows/pytests.yaml/badge.svg?branch=dev)](https://github.com/psychopy/psychopy/actions/workflows/pytests.yaml?query=branch%3Adev)  
-Release tests: [![GH tests](https://github.com/psychopy/psychopy/actions/workflows/pytests.yaml/badge.svg?branch=release)](https://github.com/psychopy/psychopy/actions/workflows/pytests.yaml?query=branch%3Arelease)
+Dev branch: [![GH tests dev](https://github.com/psychopy/psychopy/actions/workflows/pytests.yaml/badge.svg?branch=dev)](https://github.com/psychopy/psychopy/actions/workflows/pytests.yaml?query=branch%3Adev)  [![CodeQL (dev)](https://github.com/psychopy/psychopy/actions/workflows/CodeQL.yaml/badge.svg?branch=dev)](https://github.com/psychopy/psychopy/actions/workflows/CodeQL.yaml?query=branch%3Adev) 
+
+Release branch: [![GH tests release](https://github.com/psychopy/psychopy/actions/workflows/pytests.yaml/badge.svg?branch=release)](https://github.com/psychopy/psychopy/actions/workflows/pytests.yaml?query=branch%3Arelease) [![CodeQL (release)](https://github.com/psychopy/psychopy/actions/workflows/CodeQL.yaml/badge.svg?branch=release)](https://github.com/psychopy/psychopy/actions/workflows/CodeQL.yaml?query=branch%3Arelease)
 
 ## More information