From 511483c377dc61cbf7d169ba695f3bf2c124b53c Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Wed, 8 Jun 2022 22:36:51 +0000 Subject: [PATCH 1/2] 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 630092d1..4e67f13b 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 6407dfbd678318354607a72698cb304f7e5df721 Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Wed, 8 Jun 2022 23:16:11 +0000 Subject: [PATCH 2/2] chore: fix ci --- noxfile.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/noxfile.py b/noxfile.py index e9dfec00..05027718 100644 --- a/noxfile.py +++ b/noxfile.py @@ -42,7 +42,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") @@ -52,12 +52,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)