Merge branch 'main' into matiiss-add-mask-to_surface-area-kwarg

Author: Matiiss

.circleci/config.yml

@@ -4,19 +4,18 @@ root=true
 end_of_line = lf
 insert_final_newline = true
 
-# The settings for C (*.c and *.h) files are mirrored in src_c/.clang-format.
-# Keep them in sync.
-[*.{c,h}]
+[*.{c,h,py,pyx,pyi}]
 indent_style = space
 indent_size = 4
 tab_width = 4
+charset = utf-8
 trim_trailing_whitespace = true
+
+# The settings for C (*.c and *.h) files are mirrored in src_c/.clang-format.
+# Keep them in sync.
+[*.{c,h}]
 max_line_length = 79
 
-[*.{py,pyx}]
-indent_style = space
-indent_size = 4
-charset = utf-8
+[*.{py,pyx,pyi}]
 file_type_emacs = python
-trim_trailing_whitespace = true
-max_line_length = 79
+max_line_length = 88

src_py/.editorconfig renamed to .editorconfig

@@ -0,0 +1,10 @@
+# define files/directories that won't be exported in an sdist
+# Keep in sync with MANIFEST.in
+.github/ export-ignore
+buildconfig/macdependencies/ export-ignore
+buildconfig/manylinux-build/ export-ignore
+
+.editorconfig export-ignore
+.gitattributes export-ignore
+.gitignore export-ignore
+.pre-commit-config.yaml export-ignore

.gitattributes

@@ -6,4 +6,4 @@
 # example. The documentation can be seen here:
 # https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
 
-* @pygame-community/pygame-contributing-admins
+* @pygame-community/pygame-senior-reviewers

.github/CODEOWNERS

@@ -2,7 +2,7 @@
 name: 🗎 Blank Issue
 about: A blank issue. For those who know what they are doing.
 title: ''
-labels: 
+labels:
 assignees: ''
 
----
+---

.github/ISSUE_TEMPLATE/blank_issue.md

@@ -11,12 +11,32 @@ assignees: ''
 
 **Environment:**
 
-You can get some of this info from the text that pops up in the console when you run a pygame program.
+If possible, please include the output of `pygame.print_debug_info()` from your program in your bug report. It looks something
+like this:
 
-- **Operating system** (e.g. Windows, Linux(Debian), Linux(Ubuntu), Mac):
-- **Python version** (e.g. 3.11.1, 3.8.5) :
-- **SDL version** (e.g. SDL 2.0.12):
-- **PyGame version** (e.g. 2.0.0.dev10, 1.9.6):
+```
+pygame-ce 6.6.6 (SDL 2.30.3, Python 3.11.1)
+Platform:		Windows-10-10.0.22631-SP0
+System:			Windows
+System Version:	10.0.22631
+Processor:		AMD64 Family 23 Model 113 Stepping 0, AuthenticAMD
+Architecture:	Bits: 64bit	Linkage: WindowsPE
+
+Python:			    CPython 3.11.1 (tags/v3.11.1:a7a450f, Dec  6 2022, 19:58:39) [MSC v.1934 64 bit (AMD64)]
+pygame version:		2.5.0.dev3
+SDL versions:		Linked: 2.30.3	Compiled: 2.30.3
+SDL Mixer versions:	Linked: 2.8.0	Compiled: 2.8.0
+SDL Font versions:	Linked: 2.22.0	Compiled: 2.22.0
+SDL Image versions:	Linked: 2.8.2	Compiled: 2.8.2
+Freetype versions:	Linked: 2.11.1	Compiled: 2.11.1
+
+Display Driver:		windows
+Mixer Driver:		wasapi
+```
+If you can't get the debug output, any of the environment details included in it that you do know would be useful
+in diagnosing the issue & helping you.
+
+Other environment details, not included in `print_debug_info()`, that might help:
 - **Relevant hardware** (e.g. if reporting a bug about a controller, tell us the brand & name of it):
 
 **Current behavior:**

.github/ISSUE_TEMPLATE/bug_report.md

@@ -9,4 +9,4 @@ assignees: ''
 
 **Description**
 
-Describe your enhancement, as clearly as possible.
+Describe your enhancement, as clearly as possible.

.github/ISSUE_TEMPLATE/enhancement.md

@@ -35,26 +35,45 @@ concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}-debian-multiarch
   cancel-in-progress: true
 
+# this command is called in two places, so save it in an env first
+env:
+  INSTALL_CMD: |
+    apt-get update --fix-missing
+    apt-get upgrade -y
+    apt-get install build-essential meson cython3 -y
+    apt-get install libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev -y
+    apt-get install libfreetype6-dev libportmidi-dev fontconfig -y
+    apt-get install python3-dev python3-pip python3-wheel python3-sphinx -y
+    pip3 install meson-python "sphinx-autoapi<=3.3.2" --break-system-packages
+
 jobs:
   build-multiarch:
-    name: Debian (Bullseye - 11) [${{ matrix.arch }}]
+    name: Debian (Bookworm - 12) [${{ matrix.arch }}]
     runs-on: ubuntu-22.04
 
     strategy:
       fail-fast: false  # if a particular matrix build fails, don't skip the rest
       matrix:
         # maybe more things could be added in here in the future (if needed)
-        arch: [s390x, ppc64le]
+        include:
+          - { arch: s390x, base_image: '' }
+          - { arch: ppc64le, base_image: '' }
+          - { arch: armv6, base_image: '' }
+          # a custom base_image is specified in the armv7 case. This is done because
+          # the armv6 image is just raspbian in disguise. And the wheel built on armv7
+          # is going to be tested on armv6
+          - { arch: armv7, base_image: 'balenalib/raspberrypi3-debian:bookworm' }
 
     steps:
-    - uses: actions/checkout@v4.1.1
+    - uses: actions/checkout@v4.2.2
 
     - name: Build sources and run tests
-      uses: uraimo/run-on-arch-action@v2.6.0
+      uses: uraimo/run-on-arch-action@v3.0.0
       id: build
       with:
-        arch: ${{ matrix.arch }}
-        distro: bullseye
+        arch: ${{ matrix.base_image && 'none' || matrix.arch }}
+        distro: ${{ matrix.base_image && 'none' || 'bookworm' }}
+        base_image: ${{ matrix.base_image }}
 
         # Not required, but speeds up builds
         githubToken: ${{ github.token }}
@@ -74,20 +93,58 @@ jobs:
         # builds don't have to re-install them. The image layer is cached
         # publicly in your project's package repository, so it is vital that
         # no secrets are present in the container state or logs.
-        install: |
-          apt-get update --fix-missing
-          apt-get upgrade -y
-          apt-get install libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev libfreetype6-dev libportmidi-dev libjpeg-dev fontconfig -y
-          apt-get install python3-setuptools python3-dev python3-pip python3-wheel python3-sphinx -y
+        install: ${{ env.INSTALL_CMD }}
+
+        # Build a wheel, install it for running unit tests.
+        # pip does not know that ninja is installed, and tries to install it again.
+        # so pass --ignore-dep ninja explicitly
+        run: |
+          echo "\nBuilding and installing pygame wheel\n"
+          PIP_BREAK_SYSTEM_PACKAGES=1 python3 dev.py --ignore-dep ninja build --wheel /artifacts --lax
+          echo "\nRunning tests\n"
+          export SDL_VIDEODRIVER=dummy
+          export SDL_AUDIODRIVER=disk
+          python3 -m pygame.tests -v --exclude opengl,music,timing --time_out 300
+
+    # Upload the generated files under github actions assets section
+    - name: Upload dist
+      uses: actions/upload-artifact@v4
+      with:
+        name: pygame-multiarch-${{ matrix.arch }}-dist
+        path: ~/artifacts/*.whl
 
-        # Build a wheel, install it for running unit tests
+  # test wheels built on armv7 on armv6. Why?
+  # because piwheels expects the same armv7 wheel to work on both armv7 and armv6
+  test-armv7-on-armv6:
+    needs: build-multiarch
+    name: Debian (Bookworm - 12) [build - armv7, test - armv6]
+    runs-on: ubuntu-22.04
+    steps:
+    - name: Download all multiarch artifacts
+      uses: actions/download-artifact@v4
+      with:
+        name: pygame-multiarch-armv7-dist
+        path: ~/artifacts
+
+    - name: Rename arm wheel in artifacts
+      run: |
+        cd ~/artifacts
+        for f in *; do
+          mv "$f" "${f//armv7l/armv6l}"
+        done
+
+    - name: Test armv7 wheel on armv6
+      uses: uraimo/run-on-arch-action@v3.0.0
+      with:
+        arch: armv6
+        distro: bookworm
+        githubToken: ${{ github.token }}
+        dockerRunArgs: --volume ~/artifacts:/artifacts_new
+        shell: /bin/sh
+        install: ${{ env.INSTALL_CMD }}
         run: |
-          export PIP_CONFIG_FILE=buildconfig/pip_config.ini
-          echo "\nBuilding pygame wheel\n"
-          python3 setup.py docs
-          pip3 wheel . --wheel-dir /artifacts -vvv
           echo "\nInstalling wheel\n"
-          pip3 install --no-index --pre --find-links /artifacts pygame-ce
+          pip3 install --no-index --pre --break-system-packages --find-links /artifacts_new pygame-ce
           echo "\nRunning tests\n"
           export SDL_VIDEODRIVER=dummy
           export SDL_AUDIODRIVER=disk

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

@@ -40,33 +40,12 @@ jobs:
       SDK_ARCHIVE: python3.11-wasm-sdk-Ubuntu-22.04.tar.lz4
       SDKROOT: /opt/python-wasm-sdk
 
-      # use the most recent cython from github, but pin on a commit for CI
-      # stability. This is also needed to benefit from caching cython installs
-      LATEST_CYTHON_COMMIT: 2f3a781dcca092ce95fbfef2736b12b0d1ab50dd # cython 3.0.0
-
-      WHEELHOUSE_CYTHON: /tmp/wheelhouse/cython
-
     steps:
-    - uses: actions/checkout@v4.1.1
-
-    - name: Cache Cython
-      id: cache-cython
-      uses: actions/cache@v3.3.2
-      with:
-        path: ${{ env.WHEELHOUSE_CYTHON }}
-        key: wasm-ubuntu-cython-${{ env.LATEST_CYTHON_COMMIT }}-path-${{ env.WHEELHOUSE_CYTHON }}
-
-    # This builds the cython wheel and stores it in cache too
-    - name: Download and build cython on cache miss
-      if: steps.cache-cython.outputs.cache-hit != 'true'
-      run: |
-        mkdir -p $WHEELHOUSE_CYTHON
-        pip wheel --wheel-dir $WHEELHOUSE_CYTHON git+https://github.com/cython/cython.git@$LATEST_CYTHON_COMMIT
+    - uses: actions/checkout@v4.2.2
 
-    - name: Install latest cython and regen
+    - name: Regen with latest cython (using system python3)
       run: |
-        pip install --no-index --find-links $WHEELHOUSE_CYTHON --pre cython
-        touch $(find | grep pxd$)
+        pip3 install cython==3.0.10
         python3 setup.py cython_only
 
     - name: Install python-wasm-sdk