From ea5c2d8545682ed4232d54d6d4e1364ce1e503c5 Mon Sep 17 00:00:00 2001 From: Yoshi Automation Bot Date: Thu, 25 Jun 2020 10:50:03 -0700 Subject: [PATCH] chore: pin to older sphinx (#40) This PR was generated using Autosynth. :rainbow: Synth log will be available here: https://source.cloud.google.com/results/invocations/e93a3b66-0b9d-4731-8049-5d33389af1dc/targets - [ ] To automatically regenerate this PR, check this box. Source-Link: https://github.com/googleapis/synthtool/commit/cd522c3b4dde821766d95c80ae5aeb43d7a41170 --- docs/conf.py | 2 +- google/cloud/monitoring_v3/proto/common_pb2.py | 6 +++--- noxfile.py | 2 +- synth.metadata | 4 ++-- synth.py | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/docs/conf.py b/docs/conf.py index c27d73b8..ab6d693c 100644 --- a/docs/conf.py +++ b/docs/conf.py @@ -43,7 +43,7 @@ # autodoc/autosummary flags autoclass_content = "both" -autodoc_default_flags = ["members"] +autodoc_default_options = {"members": True} autosummary_generate = True diff --git a/google/cloud/monitoring_v3/proto/common_pb2.py b/google/cloud/monitoring_v3/proto/common_pb2.py index df3b1a78..f2421731 100644 --- a/google/cloud/monitoring_v3/proto/common_pb2.py +++ b/google/cloud/monitoring_v3/proto/common_pb2.py @@ -673,9 +673,9 @@ { "DESCRIPTOR": _TIMEINTERVAL, "__module__": "google.cloud.monitoring_v3.proto.common_pb2", - "__doc__": """A closed time interval. It extends from the start time to - the end time, and includes both: ``[startTime, endTime]``. Valid time - intervals depend on the + "__doc__": """A closed time interval. It extends from the start time to the end time, + and includes both: ``[startTime, endTime]``. Valid time intervals depend + on the ```MetricKind`` `__ of the metric value. In no case can the end time be earlier than the start time. diff --git a/noxfile.py b/noxfile.py index 1f2fdd13..fef9e7ba 100644 --- a/noxfile.py +++ b/noxfile.py @@ -139,7 +139,7 @@ def docs(session): """Build the docs for this library.""" session.install("-e", ".") - session.install("sphinx<3.0", "alabaster", "recommonmark") + session.install("sphinx<3.0.0", "alabaster", "recommonmark") shutil.rmtree(os.path.join("docs", "_build"), ignore_errors=True) session.run( diff --git a/synth.metadata b/synth.metadata index 6013a868..06138a5b 100644 --- a/synth.metadata +++ b/synth.metadata @@ -4,7 +4,7 @@ "git": { "name": ".", "remote": "https://github.com/googleapis/python-monitoring.git", - "sha": "4f8096b746b56dbd5fe627a8171c6ea559c92a26" + "sha": "e45865745551f720d46e4f15e3da4e293c99f130" } }, { @@ -19,7 +19,7 @@ "git": { "name": "synthtool", "remote": "https://github.com/googleapis/synthtool.git", - "sha": "4e1d2cb79b02d7496b1452f91c518630c207145e" + "sha": "cd522c3b4dde821766d95c80ae5aeb43d7a41170" } } ], diff --git a/synth.py b/synth.py index f5279086..756269b8 100644 --- a/synth.py +++ b/synth.py @@ -116,7 +116,7 @@ s.move(templated_files) # TODO(busunkim): Use latest sphinx after microgenerator transition -s.replace("noxfile.py", '"sphinx"', '"sphinx<3.0.0"') +s.replace("noxfile.py", """['"]sphinx['"]""", '"sphinx<3.0.0"') s.shell.run(["nox", "-s", "blacken"], hide_output=False)