Merge branch 'main' into add-dcs

Author: andrewhong04

.circleci/config.yml

@@ -27,7 +27,7 @@ jobs:
       - run:
           name: Build the Linux wheels.
           command: |
-            pip3 install --user cibuildwheel==2.10.2
+            pip3 install --user cibuildwheel==2.12.0
             PATH="$HOME/.local/bin:$PATH" cibuildwheel --output-dir wheelhouse
 
       - store_artifacts:

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

@@ -50,7 +50,7 @@ jobs:
         arch: [s390x, ppc64le]
 
     steps:
-    - uses: actions/checkout@v3.0.2
+    - uses: actions/checkout@v3.3.0
 
     - name: Build sources and run tests
       uses: uraimo/[email protected]

.github/workflows/build-emsdk.yml

@@ -47,7 +47,7 @@ jobs:
       WHEELHOUSE_CYTHON: /tmp/wheelhouse/cython
 
     steps:
-    - uses: actions/checkout@v3.0.2
+    - uses: actions/checkout@v3.3.0
 
     - name: Cache Cython
       id: cache-cython

.github/workflows/build-macos.yml

@@ -44,7 +44,7 @@ jobs:
         macarch: [arm64, x86_64]
 
     steps:
-      - uses: actions/checkout@v3.0.2
+      - uses: actions/checkout@v3.3.0
 
       - name: Test for Mac Deps cache hit
         id: macdep-cache
@@ -60,7 +60,7 @@ jobs:
         if: steps.macdep-cache.outputs.cache-hit != 'true'
         run: |
           export MAC_ARCH="${{ matrix.macarch }}"
-          brew install coreutils
+          brew install coreutils pkg-config
           cd buildconfig/macdependencies
           bash ./build_mac_deps.sh
 
@@ -129,6 +129,7 @@ jobs:
       # Setup MacOS dependencies
       CIBW_BEFORE_ALL: |
         export MAC_ARCH="${{ matrix.macarch }}"
+        brew install pkg-config
         cd buildconfig/macdependencies
         bash ./install_mac_deps.sh
 
@@ -158,7 +159,7 @@ jobs:
           key: macdep-${{ hashFiles('buildconfig/manylinux-build/**') }}-${{ hashFiles('buildconfig/macdependencies/*.sh') }}-${{ matrix.macarch }}
 
       - name: Build and test wheels
-        uses: pypa/cibuildwheel@v2.10.2
+        uses: pypa/cibuildwheel@v2.12.0
 
       - uses: actions/upload-artifact@v3
         with:

.github/workflows/build-manylinux.yml

@@ -97,10 +97,10 @@ jobs:
       CIBW_BUILD_VERBOSITY: 2
 
     steps:
-    - uses: actions/checkout@v3.0.2
+    - uses: actions/checkout@v3.3.0
 
     - name: Build and test wheels
-      uses: pypa/cibuildwheel@v2.10.2
+      uses: pypa/cibuildwheel@v2.12.0
 
     # We upload the generated files under github actions assets
     - name: Upload dist

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

@@ -50,12 +50,13 @@ jobs:
         os: [ubuntu-18.04, ubuntu-20.04, ubuntu-22.04]
 
     steps:
-    - uses: actions/checkout@v3.0.2
+    - uses: actions/checkout@v3.3.0
 
     - name: Install deps
       # install numpy from pip and not apt because the one from pip is newer,
       # and has typestubs
       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
@@ -78,9 +79,8 @@ jobs:
     - name: Test typestubs
       if: matrix.os == 'ubuntu-22.04' # run stubtest only once
       run: |
-        cd buildconfig/stubs
         pip3 install mypy
-        python3 -m mypy.stubtest pygame --allowlist mypy_allow_list.txt
+        python3 setup.py stubcheck
 
     # We upload the generated files under github actions assets
     - name: Upload sdist

.github/workflows/build-windows.yml

@@ -114,12 +114,24 @@ jobs:
             msvc-dev-arch: x86,
             pyversions: "cp36-win32"
           }
+          - {
+            name: "Pypy 3.7",
+            winarch: AMD64,
+            msvc-dev-arch: x86_amd64,
+            pyversions: "pp37-*"
+          }
           - {
             name: "Pypy 3.8",
             winarch: AMD64,
             msvc-dev-arch: x86_amd64,
             pyversions: "pp38-*"
           }
+          - {
+            name: "Pypy 3.9",
+            winarch: AMD64,
+            msvc-dev-arch: x86_amd64,
+            pyversions: "pp39-*"
+          }
 
 
     env:
@@ -145,7 +157,7 @@ jobs:
       CIBW_BUILD_VERBOSITY: 2
 
     steps:
-      - uses: actions/checkout@v3.0.2
+      - uses: actions/checkout@v3.3.0
 
       - uses: TheMrMilchmann/setup-msvc-dev@v2  # this lets us use the developer command prompt on windows
         with:
@@ -157,7 +169,7 @@ jobs:
           set MSSdk=1
           python -m pip install setuptools wheel requests numpy Sphinx
           python setup.py docs
-          python -m pip --disable-pip-version-check install cibuildwheel
+          python -m pip --disable-pip-version-check install cibuildwheel==2.12.0
           python -m cibuildwheel --output-dir wheelhouse
 
       - uses: actions/upload-artifact@v3

.github/workflows/cppcheck.yml

@@ -22,10 +22,11 @@ jobs:
     runs-on: ubuntu-20.04
 
     steps:
-      - uses: actions/checkout@v3.0.2
+      - uses: actions/checkout@v3.3.0
 
       - name: Install deps
         run: |
+          sudo apt-mark hold grub-efi-amd64-signed
           sudo apt-get update --fix-missing
           sudo apt-get upgrade
           sudo apt install cppcheck

.github/workflows/format-lint.yml

@@ -29,7 +29,7 @@ jobs:
     runs-on: ubuntu-22.04
 
     steps:
-      - uses: actions/checkout@v3.0.2
+      - uses: actions/checkout@v3.3.0
 
       - name: Install deps
         run: python3 -m pip install pylint black clang-format sphinx

README.rst

@@ -4,6 +4,7 @@
 
 
 |AppVeyorBuild| |DocsStatus| |PyPiVersion| |PyPiLicense|
+|PyPiVersion| |PyPiLicense|
 |Python3| |GithubCommits| |BlackFormatBadge|
 
 Pygame_ is a free and open-source cross-platform library
@@ -170,26 +171,23 @@ The programs in the ``examples`` subdirectory are in the public domain.
 See docs/licenses for licenses of dependencies.
 
 
-.. |AppVeyorBuild| image:: https://ci.appveyor.com/api/projects/status/x4074ybuobsh4myx?svg=true
-   :target: https://ci.appveyor.com/project/pygame/pygame
+.. |PyPiVersion| image:: https://img.shields.io/pypi/v/pygame-ce.svg?v=1
+   :target: https://pypi.python.org/pypi/pygame-ce
 
-.. |PyPiVersion| image:: https://img.shields.io/pypi/v/pygame.svg?v=1
-   :target: https://pypi.python.org/pypi/pygame
-
-.. |PyPiLicense| image:: https://img.shields.io/pypi/l/pygame.svg?v=1
-   :target: https://pypi.python.org/pypi/pygame
+.. |PyPiLicense| image:: https://img.shields.io/pypi/l/pygame-ce.svg?v=1
+   :target: https://pypi.python.org/pypi/pygame-ce
 
 .. |Python3| image:: https://img.shields.io/badge/python-3-blue.svg?v=1
 
-.. |GithubCommits| image:: https://img.shields.io/github/commits-since/pygame/pygame/2.1.2.svg
-   :target: https://github.com/pygame/pygame/compare/2.1.2...main
+.. |GithubCommits| image:: https://img.shields.io/github/commits-since/pygame-community/pygame-ce/2.1.3.svg
+   :target: https://github.com/pygame-community/pygame-ce/compare/2.1.3...main
 
 .. |DocsStatus| image:: https://img.shields.io/website?down_message=offline&label=docs&up_message=online&url=https%3A%2F%2Fpyga.me%2Fdocs%2F
 
 .. |BlackFormatBadge| image:: https://img.shields.io/badge/code%20style-black-000000.svg
     :target: https://github.com/psf/black
 
-.. _pygame: https://www.pyga.me
+.. _pygame: https://pyga.me
 .. _Simple DirectMedia Layer library: https://www.libsdl.org
 .. _We need your help: https://www.pygame.org/contribute.html
 .. _Compilation wiki page: https://www.pygame.org/wiki/Compilation