Merge branch 'main' into release-candidate-v1.24.0rc3

googleapis · Jun 11, 2024 · 3c1ae17 · 3c1ae17
2 parents b121c68 + ddceb47
commit 3c1ae17
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -39,7 +39,7 @@ jobs:
       - name: Build the documentation.
         run: nox -s docs
   unit:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         python: ['3.7', '3.8', '3.9', '3.10', '3.11', '3.12', '3.13']
@@ -83,7 +83,7 @@ jobs:
           name: coverage-artifact-${{ matrix.variant }}-${{ env.PYTHON_VERSION_TRIMMED }}
           path: .coverage-${{ matrix.variant }}-${{ env.PYTHON_VERSION_TRIMMED }}
   prerelease:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       matrix:
         python: ['3.12']

diff --git a/setup.py b/setup.py
@@ -42,7 +42,7 @@
     long_description=README,
     platforms="Posix; MacOS X",
     include_package_data=True,
-    install_requires=("protobuf >= 3.19.0, <6.0.0dev",),
+    install_requires=("protobuf >=3.19.0, <6.0.0dev",),
     extras_require={
         "testing": [
             "google-api-core >= 1.31.5",