chore: unbreak gemini_docsfx build and update noxfile.py and docs-presubmit.cfg to include gemini_docs and gemini_docfx sessions

sasha-gitg · copybara-github · commit 276f8b53fbe3 · 2024-09-06T10:50:29.000-07:00
PiperOrigin-RevId: 671822171
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
@@ -14,6 +14,7 @@ branchProtectionRules:
   requiresStrictStatusChecks: true
   requiredStatusCheckContexts:
     - 'cla/google'
+    - 'Kokoro docs-presubmit'
     - 'Presubmit - Lint and Coverage'
     - 'Presubmit - Unit Tests Python 3.8'
     - 'Presubmit - Unit Tests Python 3.9'
diff --git a/.kokoro/docs/docs-presubmit.cfg b/.kokoro/docs/docs-presubmit.cfg
@@ -24,5 +24,5 @@ env_vars: {
 # Only run this nox session.
 env_vars: {
     key: "NOX_SESSION"
-    value: "docs"
+    value: "docs docfx gemini_docs gemini_docfx"
 }
diff --git a/noxfile.py b/noxfile.py
@@ -32,6 +32,25 @@
 
 DEFAULT_PYTHON_VERSION = "3.8"
 
+DOCS_DEPENDENCIES = (
+    "sphinx==5.0.2",
+    "alabaster",
+    "google-cloud-aiplatform[evaluation]",
+    "recommonmark",
+)
+
+DOCFX_DEPENDENCIES = (
+    "gcp-sphinx-docfx-yaml",
+    "sphinxcontrib-applehelp==1.0.4",
+    "sphinxcontrib-devhelp==1.0.2",
+    "sphinxcontrib-htmlhelp==2.0.1",
+    "sphinxcontrib-qthelp==1.0.3",
+    "sphinxcontrib-serializinghtml==1.1.5",
+    "alabaster",
+    "google-cloud-aiplatform[evaluation]",
+    "recommonmark",
+)
+
 UNIT_TEST_PYTHON_VERSIONS = ["3.8", "3.9", "3.10", "3.11", "3.12"]
 UNIT_TEST_STANDARD_DEPENDENCIES = [
     "mock",
@@ -374,12 +393,8 @@ def docs(session):
 
     session.install("-e", ".")
     session.install(
-        "sphinx==5.0.2",
-        "alabaster",
-        "immutabledict",
-        "google-cloud-aiplatform[evaluation]",
+        *DOCS_DEPENDENCIES,
         "google-cloud-aiplatform[prediction]",
-        "recommonmark",
     )
 
     shutil.rmtree(os.path.join("docs", "_build"), ignore_errors=True)
@@ -402,15 +417,8 @@ def docfx(session):
 
     session.install("-e", ".")
     session.install(
-        "gcp-sphinx-docfx-yaml",
-        "sphinxcontrib-applehelp==1.0.4",
-        "sphinxcontrib-devhelp==1.0.2",
-        "sphinxcontrib-htmlhelp==2.0.1",
-        "sphinxcontrib-qthelp==1.0.3",
-        "sphinxcontrib-serializinghtml==1.1.5",
-        "alabaster",
+        *DOCFX_DEPENDENCIES,
         "google-cloud-aiplatform[prediction]",
-        "recommonmark",
     )
 
     shutil.rmtree(os.path.join("docs", "_build"), ignore_errors=True)
@@ -444,14 +452,7 @@ def gemini_docs(session):
     """Build the docs for library related to Gemini."""
 
     session.install("-e", ".")
-    session.install(
-        "sphinx==5.0.2",
-        "alabaster",
-        "immutabledict",
-        "google-cloud-aiplatform[evaluation]",
-        "google-cloud-aiplatform[prediction]",
-        "recommonmark",
-    )
+    session.install(*DOCS_DEPENDENCIES)
 
     shutil.rmtree(os.path.join("docs", "_build"), ignore_errors=True)
     session.run(
@@ -472,17 +473,7 @@ def gemini_docfx(session):
     """Build the docfx yaml files for library related to Gemini."""
 
     session.install("-e", ".")
-    session.install(
-        "gcp-sphinx-docfx-yaml",
-        "sphinxcontrib-applehelp==1.0.4",
-        "sphinxcontrib-devhelp==1.0.2",
-        "sphinxcontrib-htmlhelp==2.0.1",
-        "sphinxcontrib-qthelp==1.0.3",
-        "sphinxcontrib-serializinghtml==1.1.5",
-        "alabaster",
-        "google-cloud-aiplatform",
-        "recommonmark",
-    )
+    session.install(*DOCFX_DEPENDENCIES)
 
     shutil.rmtree(os.path.join("docs", "_build"), ignore_errors=True)
     session.run(

Original file line number	Diff line number	Diff line change
`@@ -24,5 +24,5 @@ env_vars: {`
`24`	`24`	`# Only run this nox session.`
`25`	`25`	`env_vars: {`
`26`	`26`	`key: "NOX_SESSION"`
`27`		`- value: "docs"`
	`27`	`+ value: "docs docfx gemini_docs gemini_docfx"`
`28`	`28`	`}`