From 7fc771e51f88c68da3e58d64852b909c9a74411a Mon Sep 17 00:00:00 2001
From: Anthonios Partheniou <partheniou@google.com>
Date: Wed, 8 Jun 2022 14:56:28 +0000
Subject: [PATCH 1/3] fix(deps): require protobuf<4.0.0 on v1 branch

---
 setup.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/setup.py b/setup.py
index 5cf642ac..a8505e91 100644
--- a/setup.py
+++ b/setup.py
@@ -27,6 +27,7 @@
     "google-api-core[grpc] >= 1.31.5, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.0",
     "grpc-google-iam-v1 >= 0.12.3, < 0.13dev",
     'enum34; python_version < "3.4"',
+    "protobuf<4.0.0dev",
 ]
 
 package_root = os.path.abspath(os.path.dirname(__file__))

From ece969977f061100a160e66b2e533da186ccaadc Mon Sep 17 00:00:00 2001
From: Anthonios Partheniou <partheniou@google.com>
Date: Wed, 8 Jun 2022 17:09:34 +0000
Subject: [PATCH 2/3] chore: fix ci

---
 noxfile.py | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/noxfile.py b/noxfile.py
index 9a325baf..7e741de9 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -25,12 +25,16 @@
 
 BLACK_VERSION = "black==19.3b0"
 BLACK_PATHS = ["docs", "google", "tests", "noxfile.py", "setup.py"]
+DEFAULT_PYTHON_VERSION = "3.8"
 
 if os.path.exists("samples"):
     BLACK_PATHS.append("samples")
 
+# Error if a python version is missing
+nox.options.error_on_missing_interpreters = True
 
-@nox.session(python="3.7")
+
+@nox.session(python=DEFAULT_PYTHON_VERSION)
 def lint(session):
     """Run linters.
 
@@ -42,7 +46,7 @@ def lint(session):
     session.run("flake8", "google", "tests")
 
 
-@nox.session(python="3.6")
+@nox.session(python=DEFAULT_PYTHON_VERSION)
 def blacken(session):
     """Run black.
 
@@ -56,7 +60,7 @@ def blacken(session):
     session.run("black", *BLACK_PATHS)
 
 
-@nox.session(python="3.7")
+@nox.session(python=DEFAULT_PYTHON_VERSION)
 def lint_setup_py(session):
     """Verify that setup.py is valid (including RST check)."""
     session.install("docutils", "pygments")
@@ -121,7 +125,7 @@ def system(session):
         session.run("py.test", "--quiet", system_test_folder_path, *session.posargs)
 
 
-@nox.session(python="3.7")
+@nox.session(python=DEFAULT_PYTHON_VERSION)
 def cover(session):
     """Run the final coverage report.
 
@@ -134,7 +138,7 @@ def cover(session):
     session.run("coverage", "erase")
 
 
-@nox.session(python="3.7")
+@nox.session(python=DEFAULT_PYTHON_VERSION)
 def docs(session):
     """Build the docs for this library."""
 

From 3a728fee2bd7b5136e74add99d028b4585fe95f1 Mon Sep 17 00:00:00 2001
From: Anthonios Partheniou <partheniou@google.com>
Date: Wed, 8 Jun 2022 17:20:43 +0000
Subject: [PATCH 3/3] chore: fix ci

---
 noxfile.py | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/noxfile.py b/noxfile.py
index 7e741de9..fefc42b8 100644
--- a/noxfile.py
+++ b/noxfile.py
@@ -41,7 +41,7 @@ def lint(session):
     Returns a failure if the linters find linting errors or sufficiently
     serious code quality issues.
     """
-    session.install("flake8", BLACK_VERSION)
+    session.install("flake8", BLACK_VERSION, "click<8.1")
     session.run("black", "--check", *BLACK_PATHS)
     session.run("flake8", "google", "tests")
 
@@ -51,12 +51,8 @@ def blacken(session):
     """Run black.
 
     Format code to uniform standard.
-
-    This currently uses Python 3.6 due to the automated Kokoro run of synthtool.
-    That run uses an image that doesn't have 3.6 installed. Before updating this
-    check the state of the `gcp_ubuntu_config` we use for that Kokoro run.
     """
-    session.install(BLACK_VERSION)
+    session.install(BLACK_VERSION, "click<8.1")
     session.run("black", *BLACK_PATHS)