Merge branch 'lordmauve:main' into actor_angle_movement

Author: Mambouna

.github/workflows/test.yml

@@ -4,11 +4,15 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - name: Install xvfb and pulseaudio
+      run: |
+          sudo apt update
+          sudo apt install -y xvfb pulseaudio
+    - uses: actions/checkout@v4
     - name: Set up Python 3.x
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v5
       with:
-        python-version: 3.x
+        python-version: '3.12'
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
@@ -21,18 +25,14 @@ jobs:
         flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
         # stricter tests for mission critical code
         flake8 --count src test
-
-    - name: Install xvfb and pulseaudio
-      run: |
-          sudo apt-get install xvfb pulseaudio
     - name: Run tests under xvfb
       run: |
         export XDG_RUNTIME_DIR="$RUNNER_TEMP"
         pulseaudio -D --start
         xvfb-run --auto-servernum pytest
     - name: Cleanup xvfb pidx
       uses: bcomnes/cleanup-xvfb@v1
-    - uses: actions/upload-artifact@master
+    - uses: actions/upload-artifact@v4
       if: ${{ failure() }}
       with:
           name: failed-image

.github/workflows/wheels.yml

@@ -1,28 +1,28 @@
 name: "Build Wheels"
 
 on:
-  workflow_dispatch:
   push:
-  release:
-    types:
-    - published
+    branches:
+    - main
+    tags:
+    - 'v*.*.*'
 
 jobs:
   buildpackage:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v1
-    - uses: actions/setup-python@v2
+    - uses: actions/checkout@v4
+    - uses: actions/setup-python@v4
       with:
-        python-version: 3.8
+        python-version: 3.12
 
     - name: Install wheel and SDist requirements
       run: python -m pip install "setuptools>=42.0" wheel twine
 
     - name: Build SDist
       run: python setup.py sdist bdist_wheel
 
-    - uses: actions/upload-artifact@v2
+    - uses: actions/upload-artifact@v4
       with:
         path: |
             dist/*.tar.gz
@@ -33,13 +33,15 @@ jobs:
     runs-on: ubuntu-latest
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
 
+    permissions:
+      id-token: write
+
+    environment: release
+
     steps:
-    - uses: actions/download-artifact@v2
+    - uses: actions/download-artifact@v4
       with:
         name: artifact
         path: dist
 
-    - uses: pypa/gh-action-pypi-publish@master
-      with:
-        user: __token__
-        password: ${{ secrets.pypi_password }}
+    - uses: pypa/[email protected]

.readthedocs.yaml

@@ -0,0 +1,35 @@
+# Read the Docs configuration file for Sphinx projects
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Set the OS, Python version and other tools you might need
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.12"
+    # You can also specify other tool versions:
+    # nodejs: "20"
+    # rust: "1.70"
+    # golang: "1.20"
+
+# Build documentation in the "doc/" directory with Sphinx
+sphinx:
+  configuration: doc/conf.py
+  # You can configure Sphinx to use a different builder, for instance use the dirhtml builder for simpler URLs
+  # builder: "dirhtml"
+  # Fail on all warnings to avoid broken references
+  # fail_on_warning: true
+
+# Optionally build your docs in additional formats such as PDF and ePub
+formats:
+  - pdf
+#   - epub
+
+# Optional but recommended, declare the Python requirements required
+# to build your documentation
+# See https://docs.readthedocs.io/en/stable/guides/reproducible-builds.html
+# python:
+#   install:
+#     - requirements: docs/requirements.txt

src/pgzero/loaders.py

@@ -172,7 +172,7 @@ def __dir__(self):
 
 
 class ImageLoader(ResourceLoader):
-    EXTNS = ['png', 'gif', 'jpg', 'jpeg', 'bmp']
+    EXTNS = ['png', 'gif', 'jpg', 'jpeg', 'bmp', 'webp']
     TYPE = 'image'
 
     def _load(self, path):

src/pgzero/runner.py

@@ -1,6 +1,7 @@
 from . import storage
 from . import clock
 from . import loaders
+from . import __version__
 from .game import PGZeroGame, DISPLAY_FLAGS
 from types import ModuleType
 from argparse import ArgumentParser
@@ -68,6 +69,11 @@ def main():
         action='store_true',
         help="Print periodic FPS measurements on the terminal."
     )
+    parser.add_argument(
+        '--version',
+        action='version',
+        version=f'%(prog)s {__version__}'
+    )
     parser.add_argument(
         'game',
         help="The Pygame Zero game to run (a Python file or directory)."

test/images/alien_as_webp.webp

@@ -0,0 +1,27 @@
+import unittest
+
+import pygame
+
+from pgzero.actor import Actor
+from pgzero.loaders import set_root
+
+
+TEST_DISP_W, TEST_DISP_H = (200, 100)
+
+
+class WebpLoaderTest(unittest.TestCase):
+    @classmethod
+    def setUpClass(self):
+        pygame.init()
+        pygame.display.set_mode((TEST_DISP_W, TEST_DISP_H))
+        set_root(__file__)
+
+    @classmethod
+    def tearDownClass(self):
+        pygame.display.quit()
+
+    def test_loader_finds_webp(self):
+        actor = Actor("alien_as_webp")
+
+        # Just instantiating the actor shows webp image loading works
+        assert actor