Merge remote-tracking branch 'upstream/main' into surface-refactor

Author: MightyJosip

.github/workflows/build-macos.yml

@@ -118,7 +118,7 @@ jobs:
           version: "0.5.26"
 
       - name: Build and test wheels
-        uses: pypa/cibuildwheel@v2.23.2
+        uses: pypa/cibuildwheel@v3.0.1
 
       - uses: actions/upload-artifact@v4
         with:

.github/workflows/build-manylinux.yml

@@ -74,7 +74,7 @@ jobs:
         CIBW_MANYLINUX_AARCH64_IMAGE: ghcr.io/${{ github.repository }}_aarch64:${{ steps.meta.outputs.version }}
         CIBW_MANYLINUX_PYPY_AARCH64_IMAGE: ghcr.io/${{ github.repository }}_aarch64:${{ steps.meta.outputs.version }}
 
-      uses: pypa/cibuildwheel@v2.23.2
+      uses: pypa/cibuildwheel@v3.0.1
 
     # We upload the generated files under github actions assets
     - name: Upload dist

.github/workflows/build-windows.yml

@@ -43,7 +43,7 @@ jobs:
           version: "0.5.26"
 
       - name: Build and test wheels
-        uses: pypa/cibuildwheel@v2.23.2
+        uses: pypa/cibuildwheel@v3.0.1
 
       - uses: actions/upload-artifact@v4
         with:

buildconfig/stubs/pygame/_sdl2/controller.pyi

@@ -1,6 +1,7 @@
 from typing import final
 
 from pygame.joystick import JoystickType
+from pygame.typing import ColorLike
 
 def init() -> None: ...
 def get_init() -> bool: ...
@@ -30,3 +31,4 @@ class Controller:
         self, low_frequency: float, high_frequency: float, duration: int
     ) -> bool: ...
     def stop_rumble(self) -> None: ...
+    def set_led(self, color: ColorLike, /) -> bool: ...

buildconfig/stubs/pygame/joystick.pyi

@@ -1,5 +1,6 @@
 from typing import final
 
+from pygame.typing import ColorLike
 from typing_extensions import deprecated  # added in 3.13
 
 def init() -> None: ...
@@ -31,6 +32,7 @@ class JoystickType:
         self, low_frequency: float, high_frequency: float, duration: int
     ) -> bool: ...
     def stop_rumble(self) -> None: ...
+    def set_led(self, color: ColorLike, /) -> bool: ...
 
 # according to the current implementation, Joystick is a function that returns
 # a JoystickType instance. In the future, when the C implementation is fixed to

docs/reST/ref/joystick.rst

@@ -356,6 +356,22 @@ variable. See :ref:`environment variables <environment-variables>` for more deta
 
       .. ## Joystick.stop_rumble ##
 
+   .. method:: set_led
+
+      | :sl:`Set the LED color of the joystick`
+      | :sg:`set_led(color_arg) -> bool`
+
+      Set the color of the LED on the joystick. The argument is a
+      ``pygame.Color``-compatible value (alpha being ignored). The
+      joystick's LED, if it has one, will be set to the input color.
+      If the joystick does not have an addressable LED, then this
+      method will do nothing and return False. Returns True if the
+      LED was set successfully.
+
+      .. versionadded:: 2.5.6
+
+      .. ## Joystick.set_led ##
+
    .. ## pygame.joystick.Joystick ##
 
 .. ## pygame.joystick ##

docs/reST/ref/math.rst

@@ -119,7 +119,7 @@ Conversion can be combined with swizzling or slicing to create a new order
 
    The formula is:
 
-   ``a * value + (1 - value) * b``.
+   ``a + (b - a) * value``.
 
    .. versionadded:: 2.4.0
 

docs/reST/ref/mixer.rst

@@ -597,7 +597,7 @@ The following file formats are supported
 
       Set the position (angle, distance) of a playing channel.
 
-      `angle`: Angle is in degrees.
+      `angle`: Angle in degrees.
 
       `distance`: Range from 0 to 255.
 

docs/reST/ref/sdl2_controller.rst

@@ -288,4 +288,20 @@ events related to controllers.
 
       .. ## Controller.stop_rumble ##
 
+   .. method:: set_led
+
+      | :sl:`Set the LED color of the controller`
+      | :sg:`set_led(color_arg) -> bool`
+
+      Set the color of the LED on the controller. The argument is a
+      ``pygame.Color``-compatible value (alpha being ignored). The
+      controller's LED, if it has one, will be set to the input color.
+      If the controller does not have an addressable LED, then this
+      method will do nothing and return False. Returns True if the
+      LED was set successfully.
+
+      .. versionadded:: 2.5.6
+
+      .. ## Controller.set_led ##
+
 .. ## pygame._sdl2.controller ##

docs/reST/ref/sdl2_video.rst

@@ -378,6 +378,10 @@
       | :sl:`Get or set the logical Renderer size (a device independent resolution for rendering)`
       | :sg:`logical_size -> (int width, int height)`
 
+      Note: When the rendering target is the main window, and ``logical_size``
+      has not been set before, it will contain ``(0, 0)`` and not the size of
+      the window.
+
    .. attribute:: scale
 
       | :sl:`Get the drawing scale for the current rendering target`