Merge branch 'main' of https://github.com/pygame-community/pygame-ce into base-header

Author: oddbookworm

.github/workflows/build-ubuntu-coverage.yml

@@ -1,10 +1,13 @@
-# This workflow runs a build with a python version that has debug symbols
+# This workflow runs a build with a python version that has debug symbols.
+# Also generates coverage information from unit tests. Note that for intrinsics,
+# it only runs what gets compiled and would naturally run. It also is limited to
+# what can run in a CI environment.
 # Update this workflow when our min/max python minor versions update
 # This workflow is necessary to ensure that we can build and run with
 # a debug python build without too much worrying about SIGABRT being thrown
 # IMPORTANT: binaries are not to be uploaded from this workflow!
 
-name: Ubuntu debug python
+name: Ubuntu Checks
 defaults:
   run:
     shell: bash -leo pipefail {0}
@@ -23,7 +26,7 @@ on:
       - '*.md'
       - '.github/workflows/*.yml'
       # re-include current file to not be excluded
-      - '!.github/workflows/build-ubuntu-debug-python.yml'
+      - '!.github/workflows/run-ubuntu-checks.yml'
 
   pull_request:
     branches: main
@@ -35,14 +38,14 @@ on:
       - '*.md'
       - '.github/workflows/*.yml'
       # re-include current file to not be excluded
-      - '!.github/workflows/build-ubuntu-debug-python.yml'
+      - '!.github/workflows/run-ubuntu-checks.yml'
 
 concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}-ubuntu-debug-python
+  group: ${{ github.workflow }}-${{ github.ref }}-ubuntu-checks
   cancel-in-progress: true
 
 jobs:
-  debug_python:
+  debug_coverage:
     runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false  # if a particular matrix build fails, don't skip the rest
@@ -69,7 +72,7 @@ jobs:
       # https://github.com/orgs/community/discussions/47863
       run: |
         sudo apt-get update --fix-missing
-
+        sudo apt-get install lcov -y
         sudo apt-get install libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev libfreetype6-dev libportmidi-dev -y
 
     - name: Install pyenv
@@ -98,7 +101,7 @@ jobs:
       id: build-pygame-ce
       run: |
         pyenv global ${{ matrix.python }}-debug
-        python dev.py build --lax
+        python dev.py build --lax --coverage
 
     - name: Run tests
       env:
@@ -107,3 +110,56 @@ jobs:
       run: |
         pyenv global ${{ matrix.python }}-debug
         python -m pygame.tests -v --exclude opengl,music,timing --time_out 300
+
+    - name: Generate coverage
+      id: gen-coverage
+      # want to continue regardless of whether a test failed or not as long as the job wasn't cancelled
+      if: ${{ steps.build-pygame-ce.conclusion == 'success' && !cancelled() }}
+      run: |
+        lcov --capture --directory . --output-file ./coverage.info
+        genhtml ./coverage.info --output-directory ./out
+
+    # We upload the generated files under github actions assets
+    - name: Upload coverage html
+      # want to continue only if the coverage generation was successful
+      if: ${{ steps.gen-coverage.conclusion == 'success' && !cancelled() }}
+      uses: actions/upload-artifact@v4
+      with:
+        name: pygame-coverage-${{ matrix.os }}-${{ matrix.python }}
+        path: ./out
+
+  # Run cppcheck static analysis on src_c changes
+  run-cppcheck:
+    runs-on: ubuntu-24.04
+    needs: debug_coverage
+
+    steps:
+    - uses: actions/checkout@v4.2.2
+      with:
+        fetch-depth: 0  # fetch full history
+
+    - name: Check if any src_c files changed
+      id: check-changes
+      continue-on-error: true
+      run: |
+        if [[ "${{ github.event_name }}" == "pull_request" ]]; then
+          CHANGED_FILES=$(git diff --name-only origin/${{ github.base_ref }}...HEAD)
+        else
+          CHANGED_FILES=$(git diff --name-only HEAD^1...HEAD)
+        fi
+        echo "Changed files: $CHANGED_FILES"
+        echo "$CHANGED_FILES" | grep '^src_c/' || echo "skip=true" >> "$GITHUB_OUTPUT"
+
+    - name: Install cppcheck
+      if: steps.check-changes.outputs.skip != 'true'
+      run: |
+        sudo apt-get update --fix-missing
+        sudo apt install cppcheck
+
+    - name: Run Static Checker
+      if: steps.check-changes.outputs.skip != 'true'
+      run: cppcheck src_c --enable=performance,portability,warning \
+        --suppress=*:src_c/freetype/ft_cache.c --suppress=*:src_c/scrap* \
+        --suppress=*:src_c/scale_mmx*.c --suppress=*:src_c/SDL_gfx/* \
+        --suppress=missingReturn --suppress=syntaxError -DWITH_THREAD -j $(nproc) \
+        -DPG_MAJOR_VERSION -DPG_MINOR_VERSION -DPG_PATCH_VERSION -DPG_VERSION_TAG

.github/workflows/cppcheck.yml

@@ -78,8 +78,8 @@ def get_urls(x86=True, x64=True):
     url_sha1 = []
     url_sha1.extend([
         [
-        '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-2.32.8/SDL2-devel-2.32.8-VC.zip',
+        'ec8bbf2a2d2bf754fe04b6ffc647f78aa7f4c2a1',
         ],
         [
         'https://github.com/libsdl-org/SDL/releases/download/release-3.2.10/SDL3-devel-3.2.10-VC.zip',
@@ -269,12 +269,12 @@ def copy(src, dst):
         copy(
             os.path.join(
                 temp_dir,
-                'SDL2-devel-2.32.6-VC/SDL2-2.32.6'
+                'SDL2-devel-2.32.8-VC/SDL2-2.32.8'
             ),
             os.path.join(
                 move_to_dir,
                 prebuilt_dir,
-                'SDL2-2.32.6'
+                'SDL2-2.32.8'
             )
         )
         copy(

.github/workflows/build-ubuntu-debug-python.yml renamed to .github/workflows/run-ubuntu-checks.yml

@@ -6,10 +6,10 @@ cd $(dirname `readlink -f "$0"`)
 # The drm already available on manylinux docker images is too old for mesa, so
 # we need to compile the latest from source
 
-DRM_VER="libdrm-2.4.123"
-DRM="drm-$DRM_VER"
+DRM_VER="libdrm-2.4.124"
+DRM="libdrm-$DRM_VER"
 
-curl -sL --retry 10 https://gitlab.freedesktop.org/mesa/drm/-/archive/$DRM_VER/$DRM.tar.gz > $DRM.tar.gz
+curl -sL --retry 10 https://gitlab.freedesktop.org/mesa/libdrm/-/archive/$DRM_VER/$DRM.tar.gz > $DRM.tar.gz
 sha512sum -c libdrm.sha512sum
 
 tar xzf $DRM.tar.gz

buildconfig/download_win_prebuilt.py

@@ -1 +1 @@
-b593eb26be0f4e3aac44dfe8ec4e37d9e1a2666f9c86f2dcd3c32bd3e6fe376bfce7bd1c47af4d39b85b3d6f43ebf12f02704f055106872fb35f1d85b45286f3  drm-libdrm-2.4.123.tar.gz
+8052839ffb2c81bc8c65e0e8e810e197ca6532fafdaf1acc181b97763068e68ba921035bb0e5675eb9c8d2ff6f32731e10d4a16f307c915e3b680453dd0e9ebd  libdrm-libdrm-2.4.124.tar.gz

buildconfig/manylinux-build/docker_base/mesa/libdrm/build-libdrm.sh

@@ -3,7 +3,7 @@ set -e -x
 
 cd $(dirname `readlink -f "$0"`)
 
-SDL2_VER="2.32.6"
+SDL2_VER="2.32.8"
 SDL2="SDL2-$SDL2_VER"
 IMG2_VER="2.8.8"
 IMG2="SDL2_image-$IMG2_VER"

buildconfig/manylinux-build/docker_base/mesa/libdrm/libdrm.sha512sum

@@ -1,4 +1,4 @@
-2dae8ae9f10e160a50f625daddad891d25e782130e5a5e3f02079d94ab8858aca92ab8871ab19fdf5be6aca83ffeb9c1ea03949841c2506066f12d2bf2332d47  SDL2-2.32.6.tar.gz
+484c33638e7bd1002815bb1f6a47a292d1eaf0b963598dde65f4a3e077dfe75ee35b9ea4b3b767365b3ef4f613c4d69ce55b5e96675de562994344e83a978272  SDL2-2.32.8.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/manylinux-build/docker_base/sdl_libs/build-sdl2-libs.sh

@@ -78,6 +78,8 @@ class Color(Collection[int]):
     @overload
     @classmethod
     def from_normalized(cls, r: float, g: float, b: float, a: float, /) -> Color: ...
+    @classmethod
+    def from_hex(cls, hex: str, /) -> Color: ...
     def normalize(self) -> tuple[float, float, float, float]: ...
     def correct_gamma(self, gamma: float, /) -> Color: ...
     @deprecated("since 2.1.3. Use unpacking instead")

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

@@ -730,6 +730,8 @@ def get_window_position() -> tuple[int, int]:
     Coordinates could be negative or outside the desktop size bounds. The
     position is relative to the topleft of the primary monitor and the y coordinate
     ignores the window frame.
+
+    .. versionadded:: 2.5.0
     """
 
 def set_window_position(position: Point) -> None:
@@ -742,6 +744,8 @@ def set_window_position(position: Point) -> None:
     ignore the window frame (y = 0 means the frame is hidden). The user will
     still be able to move the window after this call. See also
     :func:`pygame.display.get_window_position()`.
+
+    .. versionadded:: 2.5.0
     """
 
 def get_allow_screensaver() -> bool: