Skip to content

Commit 5f9f26a

Browse files
build(python): fix docs and docfx builds (#330)
Source-Link: googleapis/synthtool@fac8444 Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:5ea6d0ab82c956b50962f91d94e206d3921537ae5fe1549ec5326381d8905cfa Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com>
1 parent 6499eb0 commit 5f9f26a

File tree

3 files changed

+25
-7
lines changed

3 files changed

+25
-7
lines changed

.github/.OwlBot.lock.yaml

Lines changed: 3 additions & 3 deletions
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:230f7fe8a0d2ed81a519cfc15c6bb11c5b46b9fb449b8b1219b3771bcb520ad2
17-
# created: 2023-12-09T15:16:25.430769578Z
16+
digest: sha256:5ea6d0ab82c956b50962f91d94e206d3921537ae5fe1549ec5326381d8905cfa
17+
# created: 2024-01-15T16:32:08.142785673Z

.kokoro/requirements.txt

Lines changed: 3 additions & 3 deletions
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

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,16 @@ def docs(session):
291291

292292
session.install("-e", ".")
293293
session.install(
294-
"sphinx==4.0.1",
294+
# We need to pin to specific versions of the `sphinxcontrib-*` packages
295+
# which still support sphinx 4.x.
296+
# See https://github.com/googleapis/sphinx-docfx-yaml/issues/344
297+
# and https://github.com/googleapis/sphinx-docfx-yaml/issues/345.
298+
"sphinxcontrib-applehelp==1.0.4",
299+
"sphinxcontrib-devhelp==1.0.2",
300+
"sphinxcontrib-htmlhelp==2.0.1",
301+
"sphinxcontrib-qthelp==1.0.3",
302+
"sphinxcontrib-serializinghtml==1.1.5",
303+
"sphinx==4.5.0",
295304
"alabaster",
296305
"recommonmark",
297306
)
@@ -317,6 +326,15 @@ def docfx(session):
317326

318327
session.install("-e", ".")
319328
session.install(
329+
# We need to pin to specific versions of the `sphinxcontrib-*` packages
330+
# which still support sphinx 4.x.
331+
# See https://github.com/googleapis/sphinx-docfx-yaml/issues/344
332+
# and https://github.com/googleapis/sphinx-docfx-yaml/issues/345.
333+
"sphinxcontrib-applehelp==1.0.4",
334+
"sphinxcontrib-devhelp==1.0.2",
335+
"sphinxcontrib-htmlhelp==2.0.1",
336+
"sphinxcontrib-qthelp==1.0.3",
337+
"sphinxcontrib-serializinghtml==1.1.5",
320338
"gcp-sphinx-docfx-yaml",
321339
"alabaster",
322340
"recommonmark",

0 commit comments

Comments
 (0)