Fix more merge issues

Author: vchudnov-g

.github/workflows/unittest.yml

@@ -45,9 +45,6 @@ jobs:
           - "3.12"
           - "3.13"
           - "3.14"
-        option:
-          - ""
-          - "_protobuf_4x"
     steps:
     - name: Checkout
       uses: actions/checkout@v4
@@ -62,14 +59,14 @@ jobs:
         python -m pip install nox
     - name: Run unit tests
       env:
-        COVERAGE_FILE: .coverage${{ matrix.option }}-${{matrix.python }}
+        COVERAGE_FILE: .coverage-${{matrix.python }}
       run: |
-        nox -s unit${{ matrix.option }}-${{ matrix.python }}
+        nox -s unit-${{ matrix.python }}
     - name: Upload coverage results
       uses: actions/upload-artifact@v4
       with:
-        name: coverage-artifact-${{ matrix.option }}-${{ matrix.python }}
-        path: .coverage${{ matrix.option }}-${{ matrix.python }}
+        name: coverage-artifact-${{ matrix.python }}
+        path: .coverage-${{ matrix.python }}
         include-hidden-files: true
 
   report-coverage:

google/api_core/_python_package_support.py

@@ -37,7 +37,7 @@
 _PACKAGE_DEPENDENCY_WARNINGS = [
     DependencyConstraint(
         "google.protobuf",
-        minimum_fully_supported_version="5.0.0",
+        minimum_fully_supported_version="4.25.8",
         recommended_version="6.x",
     )
 ]

noxfile.py

@@ -218,12 +218,12 @@ def unit(session, install_grpc, install_async_rest, python_versions=None, proto4
 
     """Run the unit test suite."""
 
-    # TODO: Remove this code and the corresponding parameter once we stop support for protobuf 4.x.
+    # TODO: Remove this code and the corresponding parameters once we stop support for protobuf 4.x.
     if python_versions and session.python not in python_versions:
         session.log(f"Skipping session for Python {session.python}")
         session.skip()
 
-    # TODO: Remove this code and the corresponding parameter once we stop support for protobuf 4.x.
+    # TODO: Remove this code and the corresponding parameters once we stop support for protobuf 4.x.
     if proto4:
         # Pin protobuf to a 4.x version to ensure coverage for the legacy code path.
         session.install("protobuf>=4.25.8,<5.0.0")
@@ -235,18 +235,6 @@ def unit(session, install_grpc, install_async_rest, python_versions=None, proto4
     )
 
 
-# TODO: Remove once we stop support for protobuf 4.x.
-@nox.session(python=PYTHON_VERSIONS)
-def unit_protobuf_4x(session):
-    """Run the unit test suite with protobuf 4.x."""
-    if session.python not in ["3.9", "3.10", "3.11"]:
-        session.log(f"Skipping session for Python {session.python}")
-        session.skip()
-    # Pin protobuf to a 4.x version to ensure coverage for the legacy code path.
-    session.install("protobuf>=4.25.8,<5.0.0")
-    default(session, install_grpc=True)
-
-
 @nox.session(python=DEFAULT_PYTHON_VERSION)
 def prerelease_deps(session):
     """Run the unit test suite."""
@@ -261,12 +249,6 @@ def lint_setup_py(session):
     session.run("python", "setup.py", "check", "--restructuredtext", "--strict")
 
 
-@nox.session(python=DEFAULT_PYTHON_VERSION)
-def pytype(session):
-    """Run type-checking."""
-    session.install(".[grpc]", "pytype")
-    session.run("pytype")
-
 @nox.session(python=DEFAULT_PYTHON_VERSION)
 def mypy(session):
     """Run type-checking."""

setup.cfg

@@ -1,9 +0,0 @@
-[pytype]
-python_version = 3.9
-inputs =
-    google/
-exclude =
-    tests/
-output = .pytype/
-# Workaround for https://github.com/google/pytype/issues/150
-disable = pyi-error