Merge branch 'main' into renovate/all

Linchin · web-flow · commit d648eae589c0 · 2024-07-22T16:20:01.000-07:00
diff --git a/.kokoro/presubmit/presubmit.cfg b/.kokoro/presubmit/presubmit.cfg
@@ -1 +1,7 @@
-# Format: //devtools/kokoro/config/proto/build.proto
+# Format: //devtools/kokoro/config/proto/build.proto
+
+# Only run the following session(s)
+env_vars: {
+  key: "NOX_SESSION"
+  value: "blacken lint lint_setup_py docs"
+}
diff --git a/noxfile.py b/noxfile.py
@@ -98,9 +98,6 @@ def wrapper(*args, **kwargs):
 
 # 'docfx' is excluded since it only needs to run in 'docs-presubmit'
 nox.options.sessions = [
-    "unit",
-    "system",
-    "cover",
     "lint",
     "lint_setup_py",
     "blacken",
diff --git a/owlbot.py b/owlbot.py
@@ -58,6 +58,7 @@
         "README.rst",
         # exclude this file as we have an alternate prerelease.cfg
         ".kokoro/presubmit/prerelease-deps.cfg",
+        ".kokoro/presubmit/presubmit.cfg",
     ],
 )
 

Original file line number	Diff line number	Diff line change
`@@ -58,6 +58,7 @@`
`58`	`58`	`"README.rst",`
`59`	`59`	`# exclude this file as we have an alternate prerelease.cfg`
`60`	`60`	`".kokoro/presubmit/prerelease-deps.cfg",`
	`61`	`+ ".kokoro/presubmit/presubmit.cfg",`
`61`	`62`	`],`
`62`	`63`	`)`
`63`	`64`