Skip to content

Commit fa78520

Browse files
build(python): fix docs and docfx builds (#515)
* 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 * exclude types-protobuf==4.24.0.20240106 release * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md * 🦉 Updates from OwlBot post-processor See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --------- Co-authored-by: Owl Bot <gcf-owl-bot[bot]@users.noreply.github.com> Co-authored-by: Anthonios Partheniou <partheniou@google.com>
1 parent ada6f6a commit fa78520

File tree

4 files changed

+35
-9
lines changed

4 files changed

+35
-9
lines changed

packages/google-cloud-datastore/.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:346ab2efb51649c5dde7756cbbdc60dd394852ba83b9bbffc292a63549f33c17
17-
# created: 2023-12-14T22:17:57.611773021Z
16+
digest: sha256:5ea6d0ab82c956b50962f91d94e206d3921537ae5fe1549ec5326381d8905cfa
17+
# created: 2024-01-15T16:32:08.142785673Z

packages/google-cloud-datastore/.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 \

packages/google-cloud-datastore/noxfile.py

Lines changed: 26 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -134,8 +134,14 @@ def format(session):
134134
def mypy(session):
135135
"""Verify type hints are mypy compatible."""
136136
session.install("-e", ".")
137+
# Exclude types-protobuf==4.24.0.20240106
138+
# See https://github.com/python/typeshed/issues/11254
137139
session.install(
138-
"mypy", "types-setuptools", "types-mock", "types-protobuf", "types-requests"
140+
"mypy",
141+
"types-setuptools",
142+
"types-mock",
143+
"types-protobuf!=4.24.0.20240106",
144+
"types-requests",
139145
)
140146
session.run("mypy", "-p", "google")
141147

@@ -304,7 +310,16 @@ def docs(session):
304310

305311
session.install("-e", ".")
306312
session.install(
307-
"sphinx==4.0.1",
313+
# We need to pin to specific versions of the `sphinxcontrib-*` packages
314+
# which still support sphinx 4.x.
315+
# See https://github.com/googleapis/sphinx-docfx-yaml/issues/344
316+
# and https://github.com/googleapis/sphinx-docfx-yaml/issues/345.
317+
"sphinxcontrib-applehelp==1.0.4",
318+
"sphinxcontrib-devhelp==1.0.2",
319+
"sphinxcontrib-htmlhelp==2.0.1",
320+
"sphinxcontrib-qthelp==1.0.3",
321+
"sphinxcontrib-serializinghtml==1.1.5",
322+
"sphinx==4.5.0",
308323
"alabaster",
309324
"recommonmark",
310325
)
@@ -341,6 +356,15 @@ def docfx(session):
341356

342357
session.install("-e", ".")
343358
session.install(
359+
# We need to pin to specific versions of the `sphinxcontrib-*` packages
360+
# which still support sphinx 4.x.
361+
# See https://github.com/googleapis/sphinx-docfx-yaml/issues/344
362+
# and https://github.com/googleapis/sphinx-docfx-yaml/issues/345.
363+
"sphinxcontrib-applehelp==1.0.4",
364+
"sphinxcontrib-devhelp==1.0.2",
365+
"sphinxcontrib-htmlhelp==2.0.1",
366+
"sphinxcontrib-qthelp==1.0.3",
367+
"sphinxcontrib-serializinghtml==1.1.5",
344368
"gcp-sphinx-docfx-yaml",
345369
"alabaster",
346370
"recommonmark",

packages/google-cloud-datastore/owlbot.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -280,8 +280,10 @@ def lint_setup_py\(session\):
280280
def mypy(session):
281281
"""Verify type hints are mypy compatible."""
282282
session.install("-e", ".")
283+
# Exclude types-protobuf==4.24.0.20240106
284+
# See https://github.com/python/typeshed/issues/11254
283285
session.install(
284-
"mypy", "types-setuptools", "types-mock", "types-protobuf", "types-requests"
286+
"mypy", "types-setuptools", "types-mock", "types-protobuf!=4.24.0.20240106", "types-requests"
285287
)
286288
session.run("mypy", "-p", "google")
287289

0 commit comments

Comments
 (0)