Merge branch 'main' into matiiss-allow-sprite-group-subscripts

Author: Matiiss

.github/workflows/build-sdl3.yml

@@ -56,7 +56,9 @@ jobs:
 
     - name: Install pygame deps (linux)
       if: matrix.os == 'ubuntu-24.04'
-      run: sudo apt-get install libfreetype6-dev libportmidi-dev python3-dev
+      run: |
+        sudo apt-get update --fix-missing
+        sudo apt-get install libfreetype6-dev libportmidi-dev python3-dev
 
     - name: Install pygame deps (mac)
       if: matrix.os == 'macos-14'

README.rst

@@ -139,7 +139,7 @@ Dependency versions:
 
 
 +----------+------------------------+
-| CPython  | >= 3.8 (Or use PyPy3)  |
+| CPython  | >= 3.9 (Or use PyPy3)  |
 +----------+------------------------+
 | SDL      | >= 2.0.14              |
 +----------+------------------------+

buildconfig/stubs/pygame/_debug.pyi

@@ -1,7 +1,8 @@
-from typing import Tuple, Union, Optional, Callable
+from collections.abc import Callable
+from typing import Union, Optional
 
-ImportResult = Tuple[str, bool, Optional[Callable]]
+ImportResult = tuple[str, bool, Optional[Callable]]
 
-def str_from_tuple(version_tuple: Union[Tuple[int, int, int], None]) -> str: ...
+def str_from_tuple(version_tuple: Union[tuple[int, int, int], None]) -> str: ...
 def attempt_import(module: str, function_name: str, output_str: str = "") -> ImportResult: ...
 def print_debug_info(filename: Optional[str] = None) -> None: ...

buildconfig/stubs/pygame/_sdl2/audio.pyi

@@ -1,4 +1,4 @@
-from typing import Callable, List
+from collections.abc import Callable
 
 AUDIO_U8: int
 AUDIO_S8: int
@@ -20,7 +20,7 @@ AUDIO_ALLOW_FORMAT_CHANGE: int
 AUDIO_ALLOW_CHANNELS_CHANGE: int
 AUDIO_ALLOW_ANY_CHANGE: int
 
-def get_audio_device_names(iscapture: bool = False) -> List[str]: ...
+def get_audio_device_names(iscapture: bool = False) -> list[str]: ...
 
 class AudioDevice:
     def __init__(

buildconfig/stubs/pygame/_sdl2/controller_old.pyi

@@ -1,4 +1,5 @@
-from typing import Dict, Mapping, Optional
+from collections.abc import Mapping
+from typing import Optional
 
 from pygame.joystick import JoystickType
 
@@ -27,7 +28,7 @@ class Controller:
     def as_joystick(self) -> JoystickType: ...
     def get_axis(self, axis: int) -> int: ...
     def get_button(self, button: int) -> bool: ...
-    def get_mapping(self) -> Dict[str, str]: ...
+    def get_mapping(self) -> dict[str, str]: ...
     def set_mapping(self, mapping: Mapping[str, str]) -> int: ...
     def rumble(
         self, low_frequency: float, high_frequency: float, duration: int

buildconfig/stubs/pygame/_sdl2/touch.pyi

@@ -1,6 +1,6 @@
-from typing import Dict, Union
+from typing import Union
 
 def get_num_devices() -> int: ...
 def get_device(index: int) -> int: ...
 def get_num_fingers(device_id: int) -> int: ...
-def get_finger(touchid: int, index: int) -> Dict[str, Union[int, float]]: ...
+def get_finger(touchid: int, index: int) -> dict[str, Union[int, float]]: ...

buildconfig/stubs/pygame/_sdl2/video.pyi

@@ -1,4 +1,5 @@
-from typing import Any, Generator, Iterable, Optional, Tuple, Union
+from collections.abc import Generator, Iterable
+from typing import Any, Optional, Union
 
 from pygame.color import Color
 from pygame.rect import Rect
@@ -34,7 +35,7 @@ def messagebox(
     info: bool = False,
     warn: bool = False,
     error: bool = False,
-    buttons: Tuple[str, ...] = ("OK",),
+    buttons: tuple[str, ...] = ("OK",),
     return_button: int = 0,
     escape_button: int = 0,
 ) -> int: ...
@@ -47,7 +48,7 @@ class Texture:
         static: bool = False,
         streaming: bool = False,
         target: bool = False,
-        scale_quality: Optional[int] =None
+        scale_quality: Optional[int] = None,
     ) -> None: ...
     @staticmethod
     def from_surface(renderer: Renderer, surface: Surface) -> Texture: ...
@@ -61,7 +62,6 @@ class Texture:
     def color(self) -> Color: ...
     @color.setter
     def color(self, value: ColorLike) -> None: ...
-
     def get_rect(self, **kwargs: Any) -> Rect: ...
     def draw(
         self,
@@ -176,5 +176,5 @@ class Renderer:
     ) -> Surface: ...
     @staticmethod
     def compose_custom_blend_mode(
-        color_mode: Tuple[int, int, int], alpha_mode: Tuple[int, int, int]
+        color_mode: tuple[int, int, int], alpha_mode: tuple[int, int, int]
     ) -> int: ...

buildconfig/stubs/pygame/base.pyi

@@ -1,4 +1,5 @@
-from typing import Any, Tuple, Callable
+from collections.abc import Callable
+from typing import Any
 
 __version__: str
 
@@ -8,12 +9,12 @@ class BufferError(Exception): ...
 # Always defined
 HAVE_NEWBUF: int = 1
 
-def init() -> Tuple[int, int]: ...
+def init() -> tuple[int, int]: ...
 def quit() -> None: ...
 def get_init() -> bool: ...
 def get_error() -> str: ...
 def set_error(error_msg: str, /) -> None: ...
-def get_sdl_version(linked: bool = True) -> Tuple[int, int, int]: ...
+def get_sdl_version(linked: bool = True) -> tuple[int, int, int]: ...
 def get_sdl_byteorder() -> int: ...
 def register_quit(callable: Callable[[], Any], /) -> None: ...
 

buildconfig/stubs/pygame/bufferproxy.pyi

@@ -1,12 +1,12 @@
-from typing import Any, Dict, overload
+from typing import Any, overload
 
 class BufferProxy:
     parent: Any
     length: int
     raw: bytes
     # possibly going to be deprecated/removed soon, in which case these
     # typestubs must be removed too
-    __array_interface__: Dict[str, Any]
+    __array_interface__: dict[str, Any]
     __array_struct__: Any
     @overload
     def __init__(self) -> None: ...

buildconfig/stubs/pygame/camera.pyi

@@ -1,14 +1,14 @@
 from abc import ABC, abstractmethod
-from typing import List, Optional, Tuple, Union, Literal
+from typing import Optional, Union, Literal
 
 from pygame.typing import IntPoint
 
 from pygame.surface import Surface
 
-def get_backends() -> List[str]: ...
+def get_backends() -> list[str]: ...
 def init(backend: Optional[str] = None) -> None: ...
 def quit() -> None: ...
-def list_cameras() -> List[str]: ...
+def list_cameras() -> list[str]: ...
 def colorspace(
     surface: Surface, color: Literal["YUV", "HSV"], dest_surface: Surface = ..., /
 ) -> Surface: ...
@@ -21,7 +21,7 @@ class AbstractCamera(ABC):
     @abstractmethod
     def stop(self) -> None: ...
     @abstractmethod
-    def get_size(self) -> Tuple[int, int]: ...
+    def get_size(self) -> tuple[int, int]: ...
     @abstractmethod
     def query_image(self) -> bool: ...
     @abstractmethod
@@ -41,14 +41,14 @@ class Camera(AbstractCamera):
     ) -> None: ...
     def start(self) -> None: ...
     def stop(self) -> None: ...
-    def get_controls(self) -> Tuple[bool, bool, int]: ...
+    def get_controls(self) -> tuple[bool, bool, int]: ...
     def set_controls(
         self,
         hflip: bool = ...,
         vflip: bool = ...,
         brightness: int = ...,
-    ) -> Tuple[bool, bool, int]: ...
-    def get_size(self) -> Tuple[int, int]: ...
+    ) -> tuple[bool, bool, int]: ...
+    def get_size(self) -> tuple[int, int]: ...
     def query_image(self) -> bool: ...
     def get_image(self, surface: Optional[Surface] = None) -> Surface: ...
     def get_raw(self) -> bytes: ...