Skip to content

Commit 9b8b68d

Browse files
build(python): fix docs and docfx builds (#272)
* build(python): fix `docs` and `docfx` builds Source-Link: googleapis/synthtool@fac8444 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:5ea6d0ab82c956b50962f91d94e206d3921537ae5fe1549ec5326381d8905cfa * See googleapis/synthtool#1916 * See python/typeshed#11254 --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Anthonios Partheniou <[email protected]>
1 parent ba3278b commit 9b8b68d

File tree

3 files changed

+37
-9
lines changed

3 files changed

+37
-9
lines changed

.github/.OwlBot.lock.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2023 Google LLC
1+
# Copyright 2024 Google LLC
22
#
33
# Licensed under the Apache License, Version 2.0 (the "License");
44
# you may not use this file except in compliance with the License.
@@ -13,5 +13,5 @@
1313
# limitations under the License.
1414
docker:
1515
image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest
16-
digest: sha256:346ab2efb51649c5dde7756cbbdc60dd394852ba83b9bbffc292a63549f33c17
17-
# created: 2023-12-14T22:17:57.611773021Z
16+
digest: sha256:5ea6d0ab82c956b50962f91d94e206d3921537ae5fe1549ec5326381d8905cfa
17+
# created: 2024-01-15T16:32:08.142785673Z

.kokoro/requirements.txt

+3-3
Original file line numberDiff line numberDiff line change
@@ -263,9 +263,9 @@ jeepney==0.8.0 \
263263
# via
264264
# keyring
265265
# secretstorage
266-
jinja2==3.1.2 \
267-
--hash=sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852 \
268-
--hash=sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61
266+
jinja2==3.1.3 \
267+
--hash=sha256:7d6d50dd97d52cbc355597bd845fabfbac3f551e1f99619e39a35ce8c370b5fa \
268+
--hash=sha256:ac8bd6544d4bb2c9792bf3a159e80bba8fda7f07e81bc3aed565432d5925ba90
269269
# via gcp-releasetool
270270
keyring==24.2.0 \
271271
--hash=sha256:4901caaf597bfd3bbd78c9a0c7c4c29fcd8310dab2cffefe749e916b6527acd6 \

noxfile.py

+31-3
Original file line numberDiff line numberDiff line change
@@ -42,11 +42,13 @@ def lint(session):
4242
def mypy(session):
4343
"""Run type-checking."""
4444
session.install(".", "mypy")
45+
# Exclude types-protobuf==4.24.0.20240106
46+
# See https://github.com/python/typeshed/issues/11254
4547
session.install(
4648
"types-setuptools",
4749
"types-requests",
4850
"types-mock",
49-
"types-protobuf",
51+
"types-protobuf!=4.24.0.20240106",
5052
)
5153
session.run("mypy", "-p", "google", "-p", "tests")
5254

@@ -123,7 +125,20 @@ def docs(session):
123125

124126
session.install(".", "grpcio >= 1.8.2", "grpcio-gcp >= 0.2.2")
125127
session.install("-e", ".")
126-
session.install("sphinx==4.0.1", "alabaster", "recommonmark")
128+
session.install(
129+
# We need to pin to specific versions of the `sphinxcontrib-*` packages
130+
# which still support sphinx 4.x.
131+
# See https://github.com/googleapis/sphinx-docfx-yaml/issues/344
132+
# and https://github.com/googleapis/sphinx-docfx-yaml/issues/345.
133+
"sphinxcontrib-applehelp==1.0.4",
134+
"sphinxcontrib-devhelp==1.0.2",
135+
"sphinxcontrib-htmlhelp==2.0.1",
136+
"sphinxcontrib-qthelp==1.0.3",
137+
"sphinxcontrib-serializinghtml==1.1.5",
138+
"sphinx==4.5.0",
139+
"alabaster",
140+
"recommonmark",
141+
)
127142

128143
shutil.rmtree(os.path.join("docs", "_build"), ignore_errors=True)
129144
session.run(
@@ -145,7 +160,20 @@ def docfx(session):
145160
"""Build the docfx yaml files for this library."""
146161

147162
session.install("-e", ".")
148-
session.install("gcp-sphinx-docfx-yaml", "alabaster", "recommonmark")
163+
session.install(
164+
# We need to pin to specific versions of the `sphinxcontrib-*` packages
165+
# which still support sphinx 4.x.
166+
# See https://github.com/googleapis/sphinx-docfx-yaml/issues/344
167+
# and https://github.com/googleapis/sphinx-docfx-yaml/issues/345.
168+
"sphinxcontrib-applehelp==1.0.4",
169+
"sphinxcontrib-devhelp==1.0.2",
170+
"sphinxcontrib-htmlhelp==2.0.1",
171+
"sphinxcontrib-qthelp==1.0.3",
172+
"sphinxcontrib-serializinghtml==1.1.5",
173+
"gcp-sphinx-docfx-yaml",
174+
"alabaster",
175+
"recommonmark",
176+
)
149177

150178
shutil.rmtree(os.path.join("docs", "_build"), ignore_errors=True)
151179
session.run(

0 commit comments

Comments
 (0)