Skip to content

Commit f4da22f

Browse files
build(python): fix docs and docfx builds (#237)
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 12156f4 commit f4da22f

File tree

3 files changed

+25
-7
lines changed

3 files changed

+25
-7
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

+19-1
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,16 @@ def docs(session):
378378

379379
session.install("-e", ".")
380380
session.install(
381-
"sphinx==4.0.1",
381+
# We need to pin to specific versions of the `sphinxcontrib-*` packages
382+
# which still support sphinx 4.x.
383+
# See https://github.com/googleapis/sphinx-docfx-yaml/issues/344
384+
# and https://github.com/googleapis/sphinx-docfx-yaml/issues/345.
385+
"sphinxcontrib-applehelp==1.0.4",
386+
"sphinxcontrib-devhelp==1.0.2",
387+
"sphinxcontrib-htmlhelp==2.0.1",
388+
"sphinxcontrib-qthelp==1.0.3",
389+
"sphinxcontrib-serializinghtml==1.1.5",
390+
"sphinx==4.5.0",
382391
"alabaster",
383392
"recommonmark",
384393
)
@@ -404,6 +413,15 @@ def docfx(session):
404413

405414
session.install("-e", ".")
406415
session.install(
416+
# We need to pin to specific versions of the `sphinxcontrib-*` packages
417+
# which still support sphinx 4.x.
418+
# See https://github.com/googleapis/sphinx-docfx-yaml/issues/344
419+
# and https://github.com/googleapis/sphinx-docfx-yaml/issues/345.
420+
"sphinxcontrib-applehelp==1.0.4",
421+
"sphinxcontrib-devhelp==1.0.2",
422+
"sphinxcontrib-htmlhelp==2.0.1",
423+
"sphinxcontrib-qthelp==1.0.3",
424+
"sphinxcontrib-serializinghtml==1.1.5",
407425
"gcp-sphinx-docfx-yaml",
408426
"alabaster",
409427
"recommonmark",

0 commit comments

Comments
 (0)