Merge branch 'main' into add-support-for-protobuf-5-x

Author: parthea

.github/workflows/unittest.yml

@@ -56,9 +56,9 @@ jobs:
       run: |
         nox -s unit${{ matrix.option }}-${{ matrix.python }}
     - name: Upload coverage results
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
-        name: coverage-artifacts
+        name: coverage-artifact-${{ matrix.option }}-${{ matrix.python }}
         path: .coverage${{ matrix.option }}-${{ matrix.python }}
 
   report-coverage:
@@ -78,11 +78,11 @@ jobs:
         python -m pip install --upgrade setuptools pip wheel
         python -m pip install coverage
     - name: Download coverage results
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
-        name: coverage-artifacts
         path: .coverage-results/
     - name: Report coverage results
       run: |
-        coverage combine .coverage-results/.coverage*
+        find .coverage-results -type f -name '*.zip' -exec unzip {} \;
+        coverage combine .coverage-results/**/.coverage*
         coverage report --show-missing --fail-under=100

noxfile.py

@@ -253,7 +253,9 @@ def mypy(session):
     session.install(
         "types-setuptools",
         "types-requests",
-        "types-protobuf",
+        # TODO(https://github.com/googleapis/python-api-core/issues/642):
+        # Use the latest version of types-protobuf.
+        "types-protobuf<5",
         "types-mock",
         "types-dataclasses",
     )