test on more python versions

Signed-off-by: Aidan Jensen <[email protected]>

Author: Aidan Jensen

.github/workflows/main.yml

@@ -9,17 +9,18 @@ on:
 
 jobs:
   run_test:
-    name: ${{ matrix.py-ver-mypy-protobuf }}
-    runs-on: ubuntu-20.04
+    name: mypy - ${{ matrix.py-ver-mypy-protobuf }} - unittest - ${{ matrix.py-ver-unit-tests }}
+    runs-on: ubuntu-24.04
     # Some CI issues regarding ubuntu-latest
     # runs-on: ubuntu-latest
     env:
       PY_VER_MYPY: 3.8.17
-      PY_VER_UNIT_TESTS_3: 3.8.17
     strategy:
       matrix:
         # Running mypy-protobuf itself
-        py-ver-mypy-protobuf: [3.8.17, 3.9.17, 3.10.12, 3.11.4]
+        py-ver-mypy-protobuf: [3.8.17, 3.9.17, 3.10.12, 3.11.4, 3.12.12, 3.13.9, 3.14.0]
+        py-ver-unit-tests: [3.8.17, 3.13.9, 3.14.0]
+
     steps:
       - uses: actions/checkout@v4
       - name: Read version numbers
@@ -42,8 +43,8 @@ jobs:
       - name: Cache pyenv unit tests 3 ver
         uses: actions/cache@v4
         with:
-          path: ~/.pyenv/versions/${{env.PY_VER_UNIT_TESTS_3}}
-          key: pyenv-${{env.PY_VER_UNIT_TESTS_3}}-${{hashFiles('setup.py')}}
+          path: ~/.pyenv/versions/${{matrix.py-ver-unit-tests}}
+          key: pyenv-${{matrix.py-ver-unit-tests}}-${{hashFiles('setup.py')}}
       - name: Cache pyenv mypy ver
         uses: actions/cache@v4
         with:
@@ -61,7 +62,7 @@ jobs:
           eval "$(pyenv init --path)"
           eval "$(pyenv virtualenv-init -)"
 
-          for PY in ${{matrix.py-ver-mypy-protobuf}} ${{env.PY_VER_MYPY}} ${{env.PY_VER_UNIT_TESTS_3}}; do
+          for PY in ${{matrix.py-ver-mypy-protobuf}} ${{env.PY_VER_MYPY}} ${{matrix.py-ver-unit-tests}}; do
             if [ ! -e ~/.pyenv/versions/$PY ]; then
               pyenv install --skip-existing $PY
               pyenv shell $PY
@@ -71,6 +72,7 @@ jobs:
       - name: Run Tests (./run_test.sh)
         env:
           PY_VER_MYPY_PROTOBUF: ${{matrix.py-ver-mypy-protobuf}}
+          PY_VER_UNIT_TESTS: ${{matrix.py-ver-unit-tests}}
           VALIDATE: 1
         run: |
           export PATH="$HOME/.pyenv/bin:$PATH"

run_test.sh

@@ -156,6 +156,7 @@ for PY_VER in $PY_VER_UNIT_TESTS; do
         mypy --custom-typeshed-dir="$CUSTOM_TYPESHED_DIR" --python-executable="$UNIT_TESTS_VENV"/bin/python --python-version="$PY_VER_MYPY_TARGET" "${MODULES[@]}"
 
         # Run stubtest. Stubtest does not work with python impl - only cpp impl
+        pip install -r test_requirements.txt
         API_IMPL="$(python3 -c "import google.protobuf.internal.api_implementation as a ; print(a.Type())")"
         if [[ $API_IMPL != "python" ]]; then
             PYTHONPATH=test/generated python3 -m mypy.stubtest --custom-typeshed-dir="$CUSTOM_TYPESHED_DIR" --allowlist stubtest_allowlist.txt testproto
@@ -180,8 +181,8 @@ for PY_VER in $PY_VER_UNIT_TESTS; do
 
             # Copy over all the mypy results for the developer.
             call_mypy "$PY_VER" "${NEGATIVE_MODULES[@]}"
-            cp "$MYPY_OUTPUT/mypy_output" test_negative/output.expected.3.8
-            cp "$MYPY_OUTPUT/mypy_output.omit_linenos" test_negative/output.expected.3.8.omit_linenos
+            cp "$MYPY_OUTPUT/mypy_output" "test_negative/output.expected.$PY_VER_MYPY_TARGET"
+            cp "$MYPY_OUTPUT/mypy_output.omit_linenos" "test_negative/output.expected.$PY_VER_MYPY_TARGET.omit_linenos"
             exit 1
         fi
     )