Skip to content
This repository was archived by the owner on Feb 1, 2024. It is now read-only.

Commit a2cc376

Browse files
authored
fix(deps): require protobuf<4.0.0 on v1 branch (#268)
* fix(deps): require protobuf<4.0.0 on v1 branch * chore: fix ci
1 parent 0869983 commit a2cc376

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

noxfile.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ def lint(session):
4242
Returns a failure if the linters find linting errors or sufficiently
4343
serious code quality issues.
4444
"""
45-
session.install("flake8", BLACK_VERSION)
45+
session.install("flake8", BLACK_VERSION, "click<8.1")
4646
session.run("black", "--check", *BLACK_PATHS)
4747
session.run("flake8", "google", "tests")
4848

@@ -52,12 +52,8 @@ def blacken(session):
5252
"""Run black.
5353
5454
Format code to uniform standard.
55-
56-
This currently uses Python 3.6 due to the automated Kokoro run of synthtool.
57-
That run uses an image that doesn't have 3.6 installed. Before updating this
58-
check the state of the `gcp_ubuntu_config` we use for that Kokoro run.
5955
"""
60-
session.install(BLACK_VERSION)
56+
session.install(BLACK_VERSION, "click<8.1")
6157
session.run("black", *BLACK_PATHS)
6258

6359

setup.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
"google-api-core[grpc] >= 1.31.5, <3.0.0dev,!=2.0.*,!=2.1.*,!=2.2.*,!=2.3.0",
2828
"grpc-google-iam-v1 >= 0.12.3, < 0.13dev",
2929
'enum34; python_version < "3.4"',
30+
"protobuf<4.0.0dev",
3031
]
3132

3233
package_root = os.path.abspath(os.path.dirname(__file__))

0 commit comments

Comments
 (0)