Merge branch 'main' into matiiss-optimize-pgRect_FromObject

pygame-community · Oct 8, 2023 · d64316e · d64316e
2 parents 4b707ae + 19b2207
commit d64316e
Show file tree

Hide file tree

Showing 174 changed files with 10,079 additions and 10,027 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -29,7 +29,7 @@ jobs:
     environment:
       # these environment variables will be passed to the docker container
       - CIBW_ENVIRONMENT: PIP_CONFIG_FILE=buildconfig/pip_config.ini PORTMIDI_INC_PORTTIME=1 SDL_VIDEODRIVER=dummy SDL_AUDIODRIVER=disk
-      - CIBW_BUILD: "cp3{[7-9],10,11,12}-* pp3{[8-9],10}-*"
+      - CIBW_BUILD: "cp3{8,9,10,11,12}-* pp3{8,9,10}-*"
       - CIBW_ARCHS: aarch64
       - CIBW_SKIP: '*-musllinux_*'
       - CIBW_MANYLINUX_AARCH64_IMAGE: manylinux2014_base_aarch64
@@ -48,7 +48,7 @@ jobs:
       - run:
           name: Build the Linux wheels.
           command: |
-            pip3 install --user cibuildwheel==2.15.0
+            pip3 install --user cibuildwheel==2.16.1
             PATH="$HOME/.local/bin:$PATH" cibuildwheel --output-dir wheelhouse
 
       - store_artifacts:

diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -14,7 +14,7 @@ assignees: ''
 You can get some of this info from the text that pops up in the console when you run a pygame program.
 
 - **Operating system** (e.g. Windows, Linux(Debian), Linux(Ubuntu), Mac):
-- **Python version** (e.g. 3.7.9, 3.8.5) :
+- **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):
 - **Relevant hardware** (e.g. if reporting a bug about a controller, tell us the brand & name of it):

diff --git a/.github/workflows/build-debian-multiarch.yml b/.github/workflows/build-debian-multiarch.yml
@@ -47,7 +47,7 @@ jobs:
         arch: [s390x, ppc64le]
 
     steps:
-    - uses: actions/checkout@v4.0.0
+    - uses: actions/checkout@v4.1.0
 
     - name: Build sources and run tests
       uses: uraimo/run-on-arch-action@v2.5.1

diff --git a/.github/workflows/build-emsdk.yml b/.github/workflows/build-emsdk.yml
@@ -47,7 +47,7 @@ jobs:
       WHEELHOUSE_CYTHON: /tmp/wheelhouse/cython
 
     steps:
-    - uses: actions/checkout@v4.0.0
+    - uses: actions/checkout@v4.1.0
 
     - name: Cache Cython
       id: cache-cython

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
@@ -45,7 +45,7 @@ jobs:
         macarch: [arm64, x86_64]
 
     steps:
-      - uses: actions/checkout@v4.0.0
+      - uses: actions/checkout@v4.1.0
 
       - name: Test for Mac Deps cache hit
         id: macdep-cache
@@ -91,10 +91,10 @@ jobs:
           }
 
           - { 
-            name: "x86_64 (CPython 3.7 and Python 3.8)",
+            name: "x86_64 (Python 3.8)",
             macarch: x86_64,
-            # CPython 3.7, CPython/PyPy 3.8
-            pyversions: "cp37-* ?p38-*",
+            # CPython/PyPy 3.8
+            pyversions: "?p38-*",
           }
 
           - { 
@@ -160,7 +160,7 @@ jobs:
       CIBW_BUILD_VERBOSITY: 2
 
     steps:
-      - uses: actions/checkout@v4.0.0
+      - uses: actions/checkout@v4.1.0
 
       - name: pip cache
         uses: actions/cache@v3.3.2
@@ -177,7 +177,7 @@ jobs:
           fail-on-cache-miss: true
 
       - name: Build and test wheels
-        uses: pypa/cibuildwheel@v2.15.0
+        uses: pypa/cibuildwheel@v2.16.1
 
       - uses: actions/upload-artifact@v3
         with:

diff --git a/.github/workflows/build-manylinux.yml b/.github/workflows/build-manylinux.yml
@@ -54,7 +54,7 @@ jobs:
       # also define environment variables needed for testing
       CIBW_ENVIRONMENT: PIP_CONFIG_FILE=buildconfig/pip_config.ini PORTMIDI_INC_PORTTIME=1 SDL_VIDEODRIVER=dummy SDL_AUDIODRIVER=disk
 
-      CIBW_BUILD: "cp3{[7-9],10,11,12}-* pp3{[8-9],10}-*"
+      CIBW_BUILD: "cp3{8,9,10,11,12}-* pp3{8,9,10}-*"
       CIBW_ARCHS: ${{ matrix.arch }}
 
       # skip musllinux for now
@@ -79,7 +79,7 @@ jobs:
       CIBW_BUILD_VERBOSITY: 2
 
     steps:
-    - uses: actions/checkout@v4.0.0
+    - uses: actions/checkout@v4.1.0
 
     - name: Log in to the Container registry
       uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d
@@ -118,7 +118,7 @@ jobs:
         CIBW_MANYLINUX_I686_IMAGE: ghcr.io/${{ github.repository }}_i686:${{ steps.meta.outputs.version }}
         CIBW_MANYLINUX_PYPY_I686_IMAGE: ghcr.io/${{ github.repository }}_i686:${{ steps.meta.outputs.version }}
 
-      uses: pypa/cibuildwheel@v2.15.0
+      uses: pypa/cibuildwheel@v2.16.1
 
     # We upload the generated files under github actions assets
     - name: Upload dist

diff --git a/.github/workflows/build-ubuntu-sdist.yml b/.github/workflows/build-ubuntu-sdist.yml
@@ -51,12 +51,15 @@ jobs:
         os: [ubuntu-20.04, ubuntu-22.04]
 
     steps:
-    - uses: actions/checkout@v4.0.0
+    - uses: actions/checkout@v4.1.0
 
     - name: Install deps
       # install numpy from pip and not apt because the one from pip is newer,
       # and has typestubs
+      # https://github.com/actions/runner-images/issues/7192
+      # https://github.com/orgs/community/discussions/47863
       run: |
+        sudo apt-mark hold grub-efi-amd64-signed
         sudo apt-get update --fix-missing
         sudo apt-get upgrade
         sudo apt-get install libsdl2-dev libsdl2-image-dev libsdl2-mixer-dev libsdl2-ttf-dev libfreetype6-dev libportmidi-dev libjpeg-dev python3-setuptools python3-dev

diff --git a/.github/workflows/build-windows.yml b/.github/workflows/build-windows.yml
@@ -73,12 +73,6 @@ jobs:
             msvc-dev-arch: x86_amd64,
             pyversions: "cp38-*"
           }
-          - {
-            name: "CPython 3.7 (64 bit)",
-            winarch: AMD64,
-            msvc-dev-arch: x86_amd64,
-            pyversions: "cp37-*"
-          }
           - {
             name: "CPython 3.12 (32 bit)",
             winarch: x86,
@@ -109,12 +103,6 @@ jobs:
             msvc-dev-arch: x86,
             pyversions: "cp38-win32"
           }
-          - {
-            name: "CPython 3.7 (32 bit)",
-            winarch: x86,
-            msvc-dev-arch: x86,
-            pyversions: "cp37-win32"
-          }
           - {
             name: "Pypy 3.8",
             winarch: AMD64,
@@ -158,9 +146,9 @@ jobs:
       CIBW_BUILD_VERBOSITY: 2
 
     steps:
-      - uses: actions/checkout@v4.0.0
+      - uses: actions/checkout@v4.1.0
 
-      - uses: TheMrMilchmann/setup-msvc-dev@v2  # this lets us use the developer command prompt on windows
+      - uses: TheMrMilchmann/setup-msvc-dev@v3  # this lets us use the developer command prompt on windows
         with:
           arch: ${{ matrix.msvc-dev-arch }}
       - name: Build and test wheels
@@ -170,7 +158,7 @@ jobs:
           set MSSdk=1
           python -m pip install setuptools wheel requests numpy Sphinx"<7.2.0"
           python setup.py docs
-          python -m pip --disable-pip-version-check install cibuildwheel==2.15.0
+          python -m pip --disable-pip-version-check install cibuildwheel==2.16.1
           python -m cibuildwheel --output-dir wheelhouse
 
       - uses: actions/upload-artifact@v3

diff --git a/.github/workflows/cppcheck.yml b/.github/workflows/cppcheck.yml
@@ -22,10 +22,13 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-      - uses: actions/checkout@v4.0.0
+      - uses: actions/checkout@v4.1.0
 
       - name: Install deps
+        # https://github.com/actions/runner-images/issues/7192
+        # https://github.com/orgs/community/discussions/47863
         run: |
+          sudo apt-mark hold grub-efi-amd64-signed
           sudo apt-get update --fix-missing
           sudo apt-get upgrade
           sudo apt install cppcheck

diff --git a/.github/workflows/format-lint.yml b/.github/workflows/format-lint.yml
@@ -29,7 +29,7 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v4.0.0
+      - uses: actions/checkout@v4.1.0
 
       - name: Install deps
         run: python3 -m pip install pylint black clang-format sphinx"<7.2.0"

diff --git a/.github/workflows/release-gh-draft.yml b/.github/workflows/release-gh-draft.yml
@@ -33,7 +33,7 @@ jobs:
     needs: [manylinux-aarch64, manylinux, macos, windows, sdist]
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4.0.0
+      - uses: actions/checkout@v4.1.0
 
       - name: Download all artifacts
         uses: actions/download-artifact@v3

diff --git a/.github/workflows/release-pypi.yml b/.github/workflows/release-pypi.yml
@@ -12,7 +12,7 @@ jobs:
       # IMPORTANT: this permission is mandatory for trusted publishing
       id-token: write
     steps:
-      - uses: actions/checkout@v4.0.0
+      - uses: actions/checkout@v4.1.0
 
       - name: Pull all release assets
         uses: robinraju/release-downloader@v1.8

diff --git a/README.rst b/README.rst
@@ -128,31 +128,25 @@ excellent hosting.
 Dependencies
 ------------
 
-Pygame is obviously strongly dependent on SDL and Python.  It also
-links to and embeds several other smaller libraries.  The font
-module relies on SDL_ttf, which is dependent on freetype.  The mixer
-(and mixer.music) modules depend on SDL_mixer.  The image module
-depends on SDL_image, which also can use libjpeg and libpng.  The
-transform module has an embedded version of SDL_rotozoom for its
-own rotozoom function.  The surfarray module requires the Python
-NumPy package for its multidimensional numeric arrays.
+Pygame is obviously strongly dependent on SDL and Python. It also
+links to and embeds several other smaller libraries. The font
+module relies on SDL_ttf, which is dependent on freetype. The mixer
+(and mixer.music) modules depend on SDL_mixer. The image module
+depends on SDL_image. Transform.rotozoom has an embedded version 
+of SDL_rotozoom, and gfxdraw has an embedded version of SDL_gfx.
 Dependency versions:
 
 
 +----------+------------------------+
-| CPython  | >= 3.7 (Or use PyPy3)  |
+| CPython  | >= 3.8 (Or use PyPy3)  |
 +----------+------------------------+
-| SDL      | >= 2.0.8               |
+| SDL      | >= 2.0.9               |
 +----------+------------------------+
-| SDL_mixer| >= 2.0.0               |
+| SDL_mixer| >= 2.0.4               |
 +----------+------------------------+
-| SDL_image| >= 2.0.2               |
+| SDL_image| >= 2.0.4               |
 +----------+------------------------+
-| SDL_ttf  | >= 2.0.12              |
-+----------+------------------------+
-| SDL_gfx  | (Optional, vendored in)|
-+----------+------------------------+
-| NumPy    | >= 1.6.2 (Optional)    |
+| SDL_ttf  | >= 2.0.15              |
 +----------+------------------------+
 
 

diff --git a/buildconfig/Setup.Android.SDL2.in b/buildconfig/Setup.Android.SDL2.in
@@ -65,3 +65,4 @@ math src_c/math.c $(SDL) $(DEBUG)
 pixelcopy src_c/pixelcopy.c $(SDL) $(DEBUG)
 newbuffer src_c/newbuffer.c $(SDL) $(DEBUG)
 _window src_c/window.c $(SDL) $(DEBUG)
+geometry src_c/geometry.c $(SDL) $(DEBUG)
diff --git a/buildconfig/Setup.Emscripten.SDL2.in b/buildconfig/Setup.Emscripten.SDL2.in
@@ -62,6 +62,7 @@ rect src_c/void.c
 rwobject src_c/void.c
 system src_c/void.c
 _window src_c/void.c
+geometry src_c/void.c
 
 #_sdl2.controller src_c/_sdl2/controller.c $(SDL) $(DEBUG) -Isrc_c
 _sdl2.controller_old src_c/void.c

diff --git a/buildconfig/Setup.SDL2.in b/buildconfig/Setup.SDL2.in
@@ -75,4 +75,5 @@ math src_c/math.c $(SDL) $(DEBUG)
 pixelcopy src_c/pixelcopy.c $(SDL) $(DEBUG)
 newbuffer src_c/newbuffer.c $(SDL) $(DEBUG)
 system src_c/system.c $(SDL) $(DEBUG)
+geometry src_c/geometry.c $(SDL) $(DEBUG)
 _window src_c/window.c $(SDL) $(DEBUG)