Merge branch 'main' of https://github.com/pygame-community/pygame-ce into andrew-c-unit-testing

Author: oddbookworm

.github/workflows/build-macos.yml

@@ -1,32 +1,13 @@
 name: macOS
 
 # Run CI only when a release is created, on changes to main branch, or any PR
-# to main. Do not run CI on any other branch. Also, skip any non-source changes
-# from running on CI
+# to main.
 on:
   push:
     branches: main
-    paths-ignore:
-      - 'docs/**'
-      - 'examples/**'
-      - '.gitignore'
-      - '*.rst'
-      - '*.md'
-      - '.github/workflows/*.yml'
-      # re-include current file to not be excluded
-      - '!.github/workflows/build-macos.yml'
 
   pull_request:
     branches: main
-    paths-ignore:
-      - 'docs/**'
-      - 'examples/**'
-      - '.gitignore'
-      - '*.rst'
-      - '*.md'
-      - '.github/workflows/*.yml'
-      # re-include current file to not be excluded
-      - '!.github/workflows/build-macos.yml'
 
   # the github release drafter can call this workflow
   workflow_call:

.github/workflows/build-manylinux.yml

@@ -1,32 +1,13 @@
 name: ManyLinux
 
 # Run CI only when a release is created, on changes to main branch, or any PR
-# to main. Do not run CI on any other branch. Also, skip any non-source changes
-# from running on CI
+# to main.
 on:
   push:
     branches: main
-    paths-ignore:
-      - 'docs/**'
-      - 'examples/**'
-      - '.gitignore'
-      - '*.rst'
-      - '*.md'
-      - '.github/workflows/*.yml'
-      # re-include current file to not be excluded
-      - '!.github/workflows/build-manylinux.yml'
 
   pull_request:
     branches: main
-    paths-ignore:
-      - 'docs/**'
-      - 'examples/**'
-      - '.gitignore'
-      - '*.rst'
-      - '*.md'
-      - '.github/workflows/*.yml'
-      # re-include current file to not be excluded
-      - '!.github/workflows/build-manylinux.yml'
 
   # the github release drafter can call this workflow
   workflow_call:

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

@@ -8,32 +8,13 @@
 name: Ubuntu sdist
 
 # Run CI only when a release is created, on changes to main branch, or any PR
-# to main. Do not run CI on any other branch. Also, skip any non-source changes
-# from running on CI
+# to main.
 on:
   push:
     branches: main
-    paths-ignore:
-      - 'docs/**'
-      - 'examples/**'
-      - '.gitignore'
-      - '*.rst'
-      - '*.md'
-      - '.github/workflows/*.yml'
-      # re-include current file to not be excluded
-      - '!.github/workflows/build-ubuntu-sdist.yml'
 
   pull_request:
     branches: main
-    paths-ignore:
-      - 'docs/**'
-      - 'examples/**'
-      - '.gitignore'
-      - '*.rst'
-      - '*.md'
-      - '.github/workflows/*.yml'
-      # re-include current file to not be excluded
-      - '!.github/workflows/build-ubuntu-sdist.yml'
 
   # the github release drafter can call this workflow
   workflow_call:

.github/workflows/build-windows.yml

@@ -1,32 +1,13 @@
 name: Windows
 
 # Run CI only when a release is created, on changes to main branch, or any PR
-# to main. Do not run CI on any other branch. Also, skip any non-source changes
-# from running on CI
+# to main.
 on:
   push:
     branches: main
-    paths-ignore:
-      - 'docs/**'
-      - 'examples/**'
-      - '.gitignore'
-      - '*.rst'
-      - '*.md'
-      - '.github/workflows/*.yml'
-      # re-include current file to not be excluded
-      - '!.github/workflows/build-windows.yml'
 
   pull_request:
     branches: main
-    paths-ignore:
-      - 'docs/**'
-      - 'examples/**'
-      - '.gitignore'
-      - '*.rst'
-      - '*.md'
-      - '.github/workflows/*.yml'
-      # re-include current file to not be excluded
-      - '!.github/workflows/build-windows.yml'
 
   # the github release drafter can call this workflow
   workflow_call:

buildconfig/stubs/pygame/mask.pyi

@@ -53,6 +53,7 @@ class Mask:
         setcolor: Optional[ColorLike] = (255, 255, 255, 255),
         unsetcolor: Optional[ColorLike] = (0, 0, 0, 255),
         dest: Union[RectLike, Point] = (0, 0),
+        area: Optional[RectLike] = None,
     ) -> Surface: ...
     if sys.version_info >= (3, 12):
         def __buffer__(self, flags: int, /) -> memoryview[int]: ...

docs/meson.build

@@ -1,9 +1,13 @@
 if fs.is_dir('generated')
     # TODO: remove everything in exclude_directories except for 'doctrees'
+    # These should probably go in a separate package that the main pygame-ce
+    # package can depend on as optional extras
+    # https://github.com/pygame-community/pygame-ce/issues/3468
     install_subdir(
         'generated',
         exclude_directories: [
             'doctrees',
+            'tutorials/ko',
             '_sources/tutorials',
             '_sources/c_api',
         ],

docs/reST/ref/mask.rst

@@ -570,7 +570,7 @@ to store which parts collide.
 
       | :sl:`Returns a surface with the mask drawn on it`
       | :sg:`to_surface() -> Surface`
-      | :sg:`to_surface(surface=None, setsurface=None, unsetsurface=None, setcolor=(255, 255, 255, 255), unsetcolor=(0, 0, 0, 255), dest=(0, 0)) -> Surface`
+      | :sg:`to_surface(surface=None, setsurface=None, unsetsurface=None, setcolor=(255, 255, 255, 255), unsetcolor=(0, 0, 0, 255), dest=(0, 0), area=None) -> Surface`
 
       Draws this mask on the given surface. Set bits (bits set to 1) and unset
       bits (bits set to 0) can be drawn onto a surface.
@@ -610,6 +610,14 @@ to store which parts collide.
          mask (i.e. position ``(0, 0)`` on the mask always corresponds to
          position ``(0, 0)`` on the ``setsurface`` and ``unsetsurface``)
       :type dest: Rect or tuple(int, int) or list(int, int) or Vector2(int, int)
+      :param area: (optional) rectangular portion of the mask to draw. It can be a
+         rect-like object (a Rect, a tuple or a list with 4 numbers or an object with a
+         rect attribute, etc) or it can be None (the default) in which case it will use the
+         entire mask. If the given rect pertrudes outside the bounds of the mask (as returned
+         by :meth:`get_rect`), it will get clipped to fit those boundaries. If the final rect
+         is smaller than the mask and no destination ``surface`` is given, the returned surface
+         will have the same size as this final rect.
+      :type area: Rect or rect-like object
 
       :returns: the ``surface`` parameter (or a newly created surface if no
          ``surface`` parameter was provided) with this mask drawn on it
@@ -633,6 +641,8 @@ to store which parts collide.
 
       .. versionaddedold:: 2.0.0
 
+      .. versionchanged:: 2.5.6 Added the area keyword argument.
+
       .. ## Mask.to_surface ##
 
    .. ## pygame.mask.Mask ##

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "pygame-ce"
-version = "2.5.5.dev1"
+version = "2.5.6.dev1"
 description = "Python Game Development"
 readme = "README.rst" # for long description
 requires-python = ">=3.9"
@@ -80,6 +80,11 @@ skip = "*-musllinux_*"
 # build[uv] is verbose by default, so below flag is not needed here
 # build-verbosity = 3
 
+# In CIBW 2, defaults to pypy-enabled, but is throwing warnings about the
+# default changing in CIBW 3. So since we use pypy, lets explicitly enable it.
+# https://cibuildwheel.pypa.io/en/stable/options/#enable
+enable = ["pypy"]
+
 environment = { SDL_VIDEODRIVER="dummy", SDL_AUDIODRIVER="disk" }
 test-command = "python -m pygame.tests -v --exclude opengl,music,timing --time_out 300"
 test-requires = ["numpy"]

src_c/doc/mask_doc.h

@@ -25,4 +25,4 @@
 #define DOC_MASK_MASK_CONNECTEDCOMPONENT "connected_component() -> Mask\nconnected_component(pos) -> Mask\nReturns a mask containing a connected component"
 #define DOC_MASK_MASK_CONNECTEDCOMPONENTS "connected_components() -> [Mask, ...]\nconnected_components(minimum=0) -> [Mask, ...]\nReturns a list of masks of connected components"
 #define DOC_MASK_MASK_GETBOUNDINGRECTS "get_bounding_rects() -> [Rect, ...]\nReturns a list of bounding rects of connected components"
-#define DOC_MASK_MASK_TOSURFACE "to_surface() -> Surface\nto_surface(surface=None, setsurface=None, unsetsurface=None, setcolor=(255, 255, 255, 255), unsetcolor=(0, 0, 0, 255), dest=(0, 0)) -> Surface\nReturns a surface with the mask drawn on it"
+#define DOC_MASK_MASK_TOSURFACE "to_surface() -> Surface\nto_surface(surface=None, setsurface=None, unsetsurface=None, setcolor=(255, 255, 255, 255), unsetcolor=(0, 0, 0, 255), dest=(0, 0), area=None) -> Surface\nReturns a surface with the mask drawn on it"