From 801cfb0ed2ad1df4e00cc05e6332b2a011f0dbbb Mon Sep 17 00:00:00 2001 From: Dan Lee Date: Tue, 6 Jul 2021 18:06:06 -0400 Subject: [PATCH 1/2] docs: update Noxfile and fix codeblock typo --- google/api_core/path_template.py | 2 +- noxfile.py | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/google/api_core/path_template.py b/google/api_core/path_template.py index bb549356..f202d40f 100644 --- a/google/api_core/path_template.py +++ b/google/api_core/path_template.py @@ -104,7 +104,7 @@ def _expand_variable_match(positional_vars, named_vars, match): def expand(tmpl, *args, **kwargs): """Expand a path template with the given variables. - ..code-block:: python + .. code-block:: python >>> expand('users/*/messages/*', 'me', '123') users/me/messages/123 diff --git a/noxfile.py b/noxfile.py index 10a92efb..be0e928c 100644 --- a/noxfile.py +++ b/noxfile.py @@ -159,13 +159,13 @@ def cover(session): session.run("coverage", "erase") -@nox.session(python="3.7") +@nox.session(python="3.8") def docs(session): """Build the docs for this library.""" session.install(".", "grpcio >= 1.8.2", "grpcio-gcp >= 0.2.2") session.install("-e", ".") - session.install("sphinx < 3.0", "alabaster", "recommonmark") + session.install("sphinx==4.0.1", "alabaster", "recommonmark") shutil.rmtree(os.path.join("docs", "_build"), ignore_errors=True) session.run( @@ -182,14 +182,12 @@ def docs(session): ) -@nox.session(python="3.7") +@nox.session(python="3.8") 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==4.0.1", "alabaster", "recommonmark", "gcp-sphinx-docfx-yaml") shutil.rmtree(os.path.join("docs", "_build"), ignore_errors=True) session.run( From 4d0ce085ec73669489e3cbc8398ca25a74b1733c Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Tue, 6 Jul 2021 22:23:18 +0000 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/googleapis/repo-automation-bots/blob/master/packages/owl-bot/README.md --- noxfile.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/noxfile.py b/noxfile.py index be0e928c..25609920 100644 --- a/noxfile.py +++ b/noxfile.py @@ -187,7 +187,9 @@ def docfx(session): """Build the docfx yaml files for this library.""" session.install("-e", ".") - session.install("sphinx==4.0.1", "alabaster", "recommonmark", "gcp-sphinx-docfx-yaml") + session.install( + "sphinx==4.0.1", "alabaster", "recommonmark", "gcp-sphinx-docfx-yaml" + ) shutil.rmtree(os.path.join("docs", "_build"), ignore_errors=True) session.run(