Fix merge conflict and refcount with surface c_api object

Author: oddbookworm

.github/workflows/build-debian-multiarch.yml

@@ -68,7 +68,7 @@ jobs:
     - uses: actions/checkout@v4.2.2
 
     - name: Build sources and run tests
-      uses: uraimo/run-on-arch-action@v3.0.0
+      uses: uraimo/run-on-arch-action@v3.0.1
       id: build
       with:
         arch: ${{ matrix.base_image && 'none' || matrix.arch }}
@@ -134,7 +134,7 @@ jobs:
         done
 
     - name: Test armv7 wheel on armv6
-      uses: uraimo/run-on-arch-action@v3.0.0
+      uses: uraimo/run-on-arch-action@v3.0.1
       with:
         arch: armv6
         distro: bookworm

.github/workflows/build-macos.yml

@@ -51,7 +51,7 @@ jobs:
 
       - name: Test for Mac Deps cache hit
         id: macdep-cache
-        uses: actions/cache@v4.2.2
+        uses: actions/cache@v4.2.3
         with:
           path: ${{ github.workspace }}/pygame_mac_deps_${{ matrix.macarch }}
           # The hash of all files in buildconfig manylinux-build and macdependencies is
@@ -118,26 +118,26 @@ jobs:
       - uses: actions/checkout@v4.2.2
 
       - name: pip cache
-        uses: actions/cache@v4.2.2
+        uses: actions/cache@v4.2.3
         with:
           path: ~/Library/Caches/pip  # This cache path is only right on mac
           key: pip-cache-${{ matrix.macarch }}-${{ matrix.os }}
 
       - name: Fetch Mac deps
         id: macdep-cache
-        uses: actions/cache@v4.2.2
+        uses: actions/cache@v4.2.3
         with:
           path: ${{ github.workspace }}/pygame_mac_deps_${{ matrix.macarch }}
           key: macdep-${{ hashFiles('buildconfig/manylinux-build/**') }}-${{ hashFiles('buildconfig/macdependencies/*.sh') }}-${{ matrix.macarch }}
           fail-on-cache-miss: true
 
       - name: Install uv for speed
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v6
         with:
           version: "0.5.26"
 
       - name: Build and test wheels
-        uses: pypa/cibuildwheel@v2.23.0
+        uses: pypa/cibuildwheel@v2.23.2
 
       - uses: actions/upload-artifact@v4
         with:

.github/workflows/build-manylinux.yml

@@ -55,7 +55,7 @@ jobs:
     - uses: actions/checkout@v4.2.2
 
     - name: Log in to the Container registry
-      uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567
+      uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772
       with:
         registry: ghcr.io
         username: ${{ github.actor }}
@@ -75,7 +75,7 @@ jobs:
 
     - name: Build and push Docker image
       if: steps.inspect.outcome == 'failure'
-      uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4
+      uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0
       with:
         context: ${{ github.workspace }}/buildconfig/manylinux-build/docker_base
         file: ${{ github.workspace }}/buildconfig/manylinux-build/docker_base/Dockerfile-${{ matrix.arch }}
@@ -93,7 +93,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.0
+      uses: pypa/cibuildwheel@v2.23.2
 
     # We upload the generated files under github actions assets
     - name: Upload dist

.github/workflows/build-ubuntu-debug-python.yml

@@ -84,7 +84,7 @@ jobs:
 
     - name: Cache debug python build
       id: cache-python
-      uses: actions/cache@v4.2.2
+      uses: actions/cache@v4.2.3
       with:
         key: ${{ matrix.python }}
         path: ~/.pyenv/versions/${{ matrix.python }}-debug/**

.github/workflows/build-windows.yml

@@ -57,12 +57,12 @@ jobs:
           arch: ${{ matrix.msvc-dev-arch }}
 
       - name: Install uv for speed
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v6
         with:
           version: "0.5.26"
 
       - name: Build and test wheels
-        uses: pypa/cibuildwheel@v2.23.0
+        uses: pypa/cibuildwheel@v2.23.2
 
       - uses: actions/upload-artifact@v4
         with:

.github/workflows/release-gh-draft.yml

@@ -41,7 +41,7 @@ jobs:
         run: echo "VER=${GITHUB_REF_NAME#'release/'}" >> $GITHUB_OUTPUT
 
       - name: Generate release attestation
-        uses: actions/attest-build-provenance@v2.2.0
+        uses: actions/attest-build-provenance@v2.3.0
         with:
           subject-path: "pygame-wheels/*"
 

.github/workflows/release-pypi.yml

@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v4.2.2
 
       - name: Pull all release assets
-        uses: robinraju/release-downloader@v1.11
+        uses: robinraju/release-downloader@v1.12
         with:
           releaseId: ${{ github.event.release.id }}
           fileName: "*"

.gitignore

@@ -32,6 +32,9 @@
 # mypy
 .mypy_cache/
 
+# Ruff
+.ruff_cache
+
 # Other
 envdev*
 .virtualenv*
@@ -49,4 +52,5 @@ buildconfig/win_dll_dirs.json
 # cython generated files
 src_c/_sdl2/*.c
 !/src_c/_sdl2/touch.c
+!/src_c/_sdl2/controller.c
 src_c/pypm.c

.pre-commit-config.yaml

@@ -6,7 +6,7 @@
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.6.0
+    rev: v5.0.0
     hooks:
     - id: end-of-file-fixer
       exclude: |
@@ -26,13 +26,16 @@ repos:
           )$
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.4.2
+    rev: v0.11.5
     hooks:  # See pyproject.toml for configuration options.
+      - id: ruff
+        name: ruff-sort-imports
+        args: [ --select, I, --fix ]
       - id: ruff-format  # Run the formatter
         types_or: [ python, pyi, jupyter ]
 
   - repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v18.1.4
+    rev: v20.1.0
     hooks:
       - id: clang-format
         exclude: |

README.rst

@@ -190,7 +190,7 @@ See docs/licenses for licenses of dependencies.
 .. |Python3| image:: https://img.shields.io/badge/python-3-blue.svg?v=1
 
 .. |GithubCommits| image:: https://img.shields.io/github/commits-since/pygame-community/pygame-ce/2.5.2.svg
-   :target: https://github.com/pygame-community/pygame-ce/compare/2.5.2...main
+   :target: https://github.com/pygame-community/pygame-ce/compare/2.5.3...main
 
 .. |DocsStatus| image:: https://img.shields.io/website?down_message=offline&label=docs&up_message=online&url=https%3A%2F%2Fpyga.me%2Fdocs%2F
    :target: https://pyga.me/docs/

buildconfig/download_win_prebuilt.py

@@ -78,28 +78,28 @@ def get_urls(x86=True, x64=True):
     url_sha1 = []
     url_sha1.extend([
         [
-        'https://github.com/libsdl-org/SDL/releases/download/release-2.32.2/SDL2-devel-2.32.2-VC.zip',
-        '08737e7e813443e47b663be4d91f8a4d8de6916b',
+        'https://github.com/libsdl-org/SDL/releases/download/release-2.32.6/SDL2-devel-2.32.6-VC.zip',
+        'beab1beb38b0c5a4cc6ebd2d059431e1de631b35',
         ],
         [
-        'https://github.com/libsdl-org/SDL/releases/download/release-3.2.6/SDL3-devel-3.2.6-VC.zip',
-        'a36424427129f9ae133e59cfe070fc0b418d7fe0'
+        'https://github.com/libsdl-org/SDL/releases/download/release-3.2.10/SDL3-devel-3.2.10-VC.zip',
+        '7a17d6fc7aa509c0c020e16ca10f82d6b5c2fc57'
         ],
         [
-        'https://github.com/pygame-community/SDL_image/releases/download/2.8.4-pgce/SDL2_image-devel-2.8.4-VCpgce.zip',
-        'b9b4a5d44cab57901003255a1c1f98a42282762b'
+        'https://github.com/pygame-community/SDL_image/releases/download/2.8.8-pgce/SDL2_image-devel-2.8.8-VCpgce.zip',
+        '8cd149cbaae2d362f2eaa69483d992e79f4836f5'
         ],
         [
-        'https://github.com/libsdl-org/SDL_image/releases/download/release-3.2.0/SDL3_image-devel-3.2.0-VC.zip',
-        '2aebab1f803edfb708622fa4e1afc0afadcf5c8b'
+        'https://github.com/libsdl-org/SDL_image/releases/download/release-3.2.4/SDL3_image-devel-3.2.4-VC.zip',
+        'd0db06c5dd2c7c6399e55332ff1dccd984914cb7'
         ],
         [
         'https://github.com/libsdl-org/SDL_ttf/releases/download/release-2.24.0/SDL2_ttf-devel-2.24.0-VC.zip',
         '2d18b9a4fc2ec0eee80de2a946b088d4e6efd0ee'
         ],
         [
-        'https://github.com/libsdl-org/SDL_ttf/releases/download/release-3.2.0/SDL3_ttf-devel-3.2.0-VC.zip',
-        '2883df767c9b8c910c10108242542ef36054a267'
+        'https://github.com/libsdl-org/SDL_ttf/releases/download/release-3.2.2/SDL3_ttf-devel-3.2.2-VC.zip',
+        '3786bc016d89ca4cf9739e4d342ca29e3e29c137'
         ],
         [
         'https://github.com/libsdl-org/SDL_mixer/releases/download/release-2.8.1/SDL2_mixer-devel-2.8.1-VC.zip',
@@ -213,23 +213,23 @@ def copy(src, dst):
         copy(
             os.path.join(
                 temp_dir,
-                'SDL2_image-devel-2.8.4-VCpgce/SDL2_image-2.8.4'
+                'SDL2_image-devel-2.8.8-VCpgce/SDL2_image-2.8.8'
             ),
             os.path.join(
                 move_to_dir,
                 prebuilt_dir,
-                'SDL2_image-2.8.4'
+                'SDL2_image-2.8.8'
             )
         )
         copy(
             os.path.join(
                 temp_dir,
-                'SDL3_image-devel-3.2.0-VC/SDL3_image-3.2.0'
+                'SDL3_image-devel-3.2.4-VC/SDL3_image-3.2.4'
             ),
             os.path.join(
                 move_to_dir,
                 prebuilt_dir,
-                'SDL3_image-3.2.0'
+                'SDL3_image-3.2.4'
             )
         )
 
@@ -258,34 +258,34 @@ def copy(src, dst):
         copy(
             os.path.join(
                 temp_dir,
-                'SDL3_ttf-devel-3.2.0-VC/SDL3_ttf-3.2.0'
+                'SDL3_ttf-devel-3.2.2-VC/SDL3_ttf-3.2.2'
             ),
             os.path.join(
                 move_to_dir,
                 prebuilt_dir,
-                'SDL3_ttf-3.2.0'
+                'SDL3_ttf-3.2.2'
             )
         )
         copy(
             os.path.join(
                 temp_dir,
-                'SDL2-devel-2.32.2-VC/SDL2-2.32.2'
+                'SDL2-devel-2.32.6-VC/SDL2-2.32.6'
             ),
             os.path.join(
                 move_to_dir,
                 prebuilt_dir,
-                'SDL2-2.32.2'
+                'SDL2-2.32.6'
             )
         )
         copy(
             os.path.join(
                 temp_dir,
-                'SDL3-devel-3.2.6-VC/SDL3-3.2.6'
+                'SDL3-devel-3.2.10-VC/SDL3-3.2.10'
             ),
             os.path.join(
                 move_to_dir,
                 prebuilt_dir,
-                'SDL3-3.2.6'
+                'SDL3-3.2.10'
             )
         )
 

buildconfig/manylinux-build/docker_base/Dockerfile-aarch64

@@ -1,5 +1,5 @@
 # pin version on image for CI stability
-FROM quay.io/pypa/manylinux2014_aarch64:2025.02.23-1
+FROM quay.io/pypa/manylinux2014_aarch64:2025.03.09-1
 ENV MAKEFLAGS="-j 4"
 ENV PG_DEP_PREFIX="/usr/local"
 

buildconfig/manylinux-build/docker_base/Dockerfile-i686

@@ -1,5 +1,5 @@
 # pin version on image for CI stability
-FROM quay.io/pypa/manylinux2014_i686:2025.02.23-1
+FROM quay.io/pypa/manylinux2014_i686:2025.03.09-1
 ENV MAKEFLAGS="-j 4"
 ENV PG_DEP_PREFIX="/usr/local"
 

buildconfig/manylinux-build/docker_base/Dockerfile-x86_64

@@ -1,5 +1,5 @@
 # pin version on image for CI stability
-FROM quay.io/pypa/manylinux2014_x86_64:2025.02.23-1
+FROM quay.io/pypa/manylinux2014_x86_64:2025.03.09-1
 ENV MAKEFLAGS="-j 4"
 ENV PG_DEP_PREFIX="/usr/local"
 

buildconfig/manylinux-build/docker_base/sdl_libs/build-sdl2-libs.sh

@@ -3,9 +3,9 @@ set -e -x
 
 cd $(dirname `readlink -f "$0"`)
 
-SDL2_VER="2.32.2"
+SDL2_VER="2.32.6"
 SDL2="SDL2-$SDL2_VER"
-IMG2_VER="2.8.4"
+IMG2_VER="2.8.8"
 IMG2="SDL2_image-$IMG2_VER"
 TTF2_VER="2.24.0"
 TTF2="SDL2_ttf-$TTF2_VER"

buildconfig/manylinux-build/docker_base/sdl_libs/sdl2.sha512

@@ -1,4 +1,4 @@
-9a608974a69b97fd5589bf8feed4742498f8f07731bcd5b99dd518089acda8b9b4216197b6adf7ca79ef1a9fe47c542033eefe94763e66229b1d9ba5207da5c5  SDL2-2.32.2.tar.gz
-a4b7436442be43b96dc7b90c9badd011da1622e283ae068b82367fcb72b7dd7a0357aec5550fe44103a77da75b8c570d5204fff11a805373f2194f92b8f71343  SDL2_image-2.8.4.tar.gz
+2dae8ae9f10e160a50f625daddad891d25e782130e5a5e3f02079d94ab8858aca92ab8871ab19fdf5be6aca83ffeb9c1ea03949841c2506066f12d2bf2332d47  SDL2-2.32.6.tar.gz
+5c521ae6a053e1eb6b42dce3ccccdbdb353eb7e9d1bd89392b1913bfc9fbb6b8a9d5506c80e5b7924b51637bb95cd270657ca87dafe60edd5534e333524bc901  SDL2_image-2.8.8.tar.gz
 6148591404b2113bcdb54391821658548acfe380a9cba660113e55e6f2fb7da2a5a59a99fefe51a0d7f8b91160648f11f72750353da88d285a962e3a410aecd7  SDL2_mixer-2.8.1.tar.gz
 a0f94e26f0387385f13ec1eb08ddca677d4181969073a50af387a0dce9c7bdddf393c028c8084538e01f875e19790ef7ae9a00c5106bf7ca9d21f3fcf9eee885  SDL2_ttf-2.24.0.tar.gz

buildconfig/stubs/gen_stubs.py

@@ -128,6 +128,7 @@ def get_all(mod: Any):
     # write the module docstring of this file in the generated file, so that
     # people know this file exists
     f.write(info_header)
+    f.write("# ruff: noqa: I001\n")
     f.write(misc_stubs)
 
     for mod, items in pygame_all_imports.items():

buildconfig/stubs/pygame/__init__.pyi

@@ -1,6 +1,7 @@
 # buildconfig/stubs/gen_stubs.py
 # A script to auto-generate locals.pyi, constants.pyi and __init__.pyi typestubs
 # IMPORTANT NOTE: Do not edit this file by hand!
+# ruff: noqa: I001
 
 from . import (
     display as display,
@@ -108,11 +109,26 @@ from .constants import (
     AUDIO_U16SYS as AUDIO_U16SYS,
     AUDIO_U8 as AUDIO_U8,
     BIG_ENDIAN as BIG_ENDIAN,
+    BLENDFACTOR_DST_ALPHA as BLENDFACTOR_DST_ALPHA,
+    BLENDFACTOR_DST_COLOR as BLENDFACTOR_DST_COLOR,
+    BLENDFACTOR_ONE as BLENDFACTOR_ONE,
+    BLENDFACTOR_ONE_MINUS_DST_ALPHA as BLENDFACTOR_ONE_MINUS_DST_ALPHA,
+    BLENDFACTOR_ONE_MINUS_DST_COLOR as BLENDFACTOR_ONE_MINUS_DST_COLOR,
+    BLENDFACTOR_ONE_MINUS_SRC_ALPHA as BLENDFACTOR_ONE_MINUS_SRC_ALPHA,
+    BLENDFACTOR_ONE_MINUS_SRC_COLOR as BLENDFACTOR_ONE_MINUS_SRC_COLOR,
+    BLENDFACTOR_SRC_ALPHA as BLENDFACTOR_SRC_ALPHA,
+    BLENDFACTOR_SRC_COLOR as BLENDFACTOR_SRC_COLOR,
+    BLENDFACTOR_ZERO as BLENDFACTOR_ZERO,
     BLENDMODE_ADD as BLENDMODE_ADD,
     BLENDMODE_BLEND as BLENDMODE_BLEND,
     BLENDMODE_MOD as BLENDMODE_MOD,
     BLENDMODE_MUL as BLENDMODE_MUL,
     BLENDMODE_NONE as BLENDMODE_NONE,
+    BLENDOPERATION_ADD as BLENDOPERATION_ADD,
+    BLENDOPERATION_MAXIMUM as BLENDOPERATION_MAXIMUM,
+    BLENDOPERATION_MINIMUM as BLENDOPERATION_MINIMUM,
+    BLENDOPERATION_REV_SUBTRACT as BLENDOPERATION_REV_SUBTRACT,
+    BLENDOPERATION_SUBTRACT as BLENDOPERATION_SUBTRACT,
     BLEND_ADD as BLEND_ADD,
     BLEND_ALPHA_SDL2 as BLEND_ALPHA_SDL2,
     BLEND_MAX as BLEND_MAX,

buildconfig/stubs/pygame/_debug.pyi

@@ -1,8 +1,10 @@
 from collections.abc import Callable
-from typing import Union, Optional
+from typing import Optional, Union
 
 ImportResult = tuple[str, bool, Optional[Callable]]
 
 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 attempt_import(
+    module: str, function_name: str, output_str: str = ""
+) -> ImportResult: ...
 def print_debug_info(filename: Optional[str] = None) -> None: ...