Merge branch 'main' into clean-up

googleapis · Apr 5, 2022 · 3a5b628 · 3a5b628
2 parents 08a05ef + ae2804b
commit 3a5b628
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/noxfile.py b/noxfile.py
@@ -20,6 +20,9 @@
 
 CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute()
 
+# https://github.com/psf/black/issues/2964, pin click version to 8.0.4 to
+# avoid incompatiblity with black.
+CLICK_VERSION = "click==8.0.4"
 BLACK_VERSION = "black==19.3b0"
 BLACK_PATHS = [
     "google",
@@ -33,7 +36,9 @@
 
 @nox.session(python="3.7")
 def lint(session):
-    session.install("flake8", "flake8-import-order", "docutils", BLACK_VERSION)
+    session.install(
+        "flake8", "flake8-import-order", "docutils", CLICK_VERSION, BLACK_VERSION
+    )
     session.install("-e", ".")
     session.run("black", "--check", *BLACK_PATHS)
     session.run(
@@ -58,7 +63,7 @@ def blacken(session):
 
     https://github.com/googleapis/synthtool/blob/master/docker/owlbot/python/Dockerfile
     """
-    session.install(BLACK_VERSION)
+    session.install(CLICK_VERSION, BLACK_VERSION)
     session.run("black", *BLACK_PATHS)
 
 

diff --git a/system_tests/secrets.tar.enc b/system_tests/secrets.tar.enc