Merge pull request #306 from sasha-gitg/dev

chore: merge main into dev
googleapis · Apr 12, 2021 · 38eb76f · 38eb76f
2 parents fe33298 + 0ecd0a8
commit 38eb76f
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 5 deletions.
diff --git a/.github/sync-repo-settings.yaml b/.github/sync-repo-settings.yaml
@@ -9,4 +9,3 @@ branchProtectionRules:
     - 'Kokoro'
     - 'cla/google'
     - 'Samples - Lint'
-    - 'Samples - Python 3.7'
diff --git a/google/cloud/aiplatform/base.py b/google/cloud/aiplatform/base.py
@@ -99,7 +99,7 @@ def log_create_complete(
         self._logger.info(f"{cls.__name__} created. Resource name: {resource.name}")
         self._logger.info(f"To use this {cls.__name__} in another session:")
         self._logger.info(
-            f"{variable_name} = aiplatform.{cls.__name__}({resource.name})"
+            f"{variable_name} = aiplatform.{cls.__name__}('{resource.name}')"
         )
 
     def log_action_start_against_resource(

diff --git a/noxfile.py b/noxfile.py
@@ -204,9 +204,7 @@ def docfx(session):
     """Build the docfx yaml files for this library."""
 
     session.install("-e", ".")
-    # sphinx-docfx-yaml supports up to sphinx version 1.5.5.
-    # https://github.com/docascode/sphinx-docfx-yaml/issues/97
-    session.install("sphinx==1.5.5", "alabaster", "recommonmark", "sphinx-docfx-yaml")
+    session.install("sphinx", "alabaster", "recommonmark", "gcp-sphinx-docfx-yaml")
 
     shutil.rmtree(os.path.join("docs", "_build"), ignore_errors=True)
     session.run(