From 0ca459b19e338f1ddd0da2af0be5441700c6a84c Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Mon, 15 Jan 2024 16:36:08 +0000 Subject: [PATCH 1/8] build(python): fix `docs` and `docfx` builds Source-Link: https://github.com/googleapis/synthtool/commit/fac8444edd5f5526e804c306b766a271772a3e2f Post-Processor: gcr.io/cloud-devrel-public-resources/owlbot-python:latest@sha256:5ea6d0ab82c956b50962f91d94e206d3921537ae5fe1549ec5326381d8905cfa --- .github/.OwlBot.lock.yaml | 6 +++--- .kokoro/requirements.txt | 6 +++--- noxfile.py | 20 +++++++++++++++++++- 3 files changed, 25 insertions(+), 7 deletions(-) diff --git a/.github/.OwlBot.lock.yaml b/.github/.OwlBot.lock.yaml index 9bee24097..d8a1bbca7 100644 --- a/.github/.OwlBot.lock.yaml +++ b/.github/.OwlBot.lock.yaml @@ -1,4 +1,4 @@ -# Copyright 2023 Google LLC +# Copyright 2024 Google LLC # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -13,5 +13,5 @@ # limitations under the License. docker: image: gcr.io/cloud-devrel-public-resources/owlbot-python:latest - digest: sha256:346ab2efb51649c5dde7756cbbdc60dd394852ba83b9bbffc292a63549f33c17 -# created: 2023-12-14T22:17:57.611773021Z + digest: sha256:5ea6d0ab82c956b50962f91d94e206d3921537ae5fe1549ec5326381d8905cfa +# created: 2024-01-15T16:32:08.142785673Z diff --git a/.kokoro/requirements.txt b/.kokoro/requirements.txt index e5c1ffca9..bb3d6ca38 100644 --- a/.kokoro/requirements.txt +++ b/.kokoro/requirements.txt @@ -263,9 +263,9 @@ jeepney==0.8.0 \ # via # keyring # secretstorage -jinja2==3.1.2 \ - --hash=sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852 \ - --hash=sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61 +jinja2==3.1.3 \ + --hash=sha256:7d6d50dd97d52cbc355597bd845fabfbac3f551e1f99619e39a35ce8c370b5fa \ + --hash=sha256:ac8bd6544d4bb2c9792bf3a159e80bba8fda7f07e81bc3aed565432d5925ba90 # via gcp-releasetool keyring==24.2.0 \ --hash=sha256:4901caaf597bfd3bbd78c9a0c7c4c29fcd8310dab2cffefe749e916b6527acd6 \ diff --git a/noxfile.py b/noxfile.py index 3f9db8b2c..80de1bec1 100644 --- a/noxfile.py +++ b/noxfile.py @@ -334,7 +334,16 @@ def docs(session): session.install("-e", ".") session.install( - "sphinx==4.0.1", + # We need to pin to specific versions of the `sphinxcontrib-*` packages + # which still support sphinx 4.x. + # See https://github.com/googleapis/sphinx-docfx-yaml/issues/344 + # and https://github.com/googleapis/sphinx-docfx-yaml/issues/345. + "sphinxcontrib-applehelp==1.0.4", + "sphinxcontrib-devhelp==1.0.2", + "sphinxcontrib-htmlhelp==2.0.1", + "sphinxcontrib-qthelp==1.0.3", + "sphinxcontrib-serializinghtml==1.1.5", + "sphinx==4.5.0", "alabaster", "recommonmark", ) @@ -360,6 +369,15 @@ def docfx(session): session.install("-e", ".") session.install( + # We need to pin to specific versions of the `sphinxcontrib-*` packages + # which still support sphinx 4.x. + # See https://github.com/googleapis/sphinx-docfx-yaml/issues/344 + # and https://github.com/googleapis/sphinx-docfx-yaml/issues/345. + "sphinxcontrib-applehelp==1.0.4", + "sphinxcontrib-devhelp==1.0.2", + "sphinxcontrib-htmlhelp==2.0.1", + "sphinxcontrib-qthelp==1.0.3", + "sphinxcontrib-serializinghtml==1.1.5", "gcp-sphinx-docfx-yaml", "alabaster", "recommonmark", From 046b3fdc6d14481cbaeccd488b441ce8c5c255d5 Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Mon, 22 Jan 2024 19:10:34 +0000 Subject: [PATCH 2/8] exclude types-protobuf==4.24.0.20240106 release --- noxfile.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/noxfile.py b/noxfile.py index 80de1bec1..a00b6e0cb 100644 --- a/noxfile.py +++ b/noxfile.py @@ -92,10 +92,6 @@ def mypy(session): session.install("-e", ".[all]") session.install(MYPY_VERSION) - # Just install the type info directly, since "mypy --install-types" might - # require an additional pass. - session.install("types-protobuf", "types-setuptools") - # Version 2.1.1 of google-api-core version is the first type-checked release. # Version 2.2.0 of google-cloud-core version is the first type-checked release. session.install( @@ -103,6 +99,12 @@ def mypy(session): "google-cloud-core>=2.2.0", ) + # Just install the type info directly, since "mypy --install-types" might + # require an additional pass. + # Exclude type-protobuf==4.24.0.20240106 + # See https://github.com/python/typeshed/issues/11254 + session.install("types-protobuf!=4.24.0.20240106", "types-setuptools") + # TODO: Only check the hand-written layer, the generated code does not pass # mypy checks yet. # https://github.com/googleapis/gapic-generator-python/issues/1092 From 66ed4ce09a6786555fbda021c94428f83e4fa42e Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Mon, 22 Jan 2024 19:11:26 +0000 Subject: [PATCH 3/8] typo --- noxfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/noxfile.py b/noxfile.py index a00b6e0cb..ec63afcb4 100644 --- a/noxfile.py +++ b/noxfile.py @@ -101,7 +101,7 @@ def mypy(session): # Just install the type info directly, since "mypy --install-types" might # require an additional pass. - # Exclude type-protobuf==4.24.0.20240106 + # Exclude types-protobuf==4.24.0.20240106 # See https://github.com/python/typeshed/issues/11254 session.install("types-protobuf!=4.24.0.20240106", "types-setuptools") From 2b9a05fd089d46ecfd6836d8e2b62b5498d68efb Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Mon, 22 Jan 2024 19:13:30 +0000 Subject: [PATCH 4/8] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot=20po?= =?UTF-8?q?st-processor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --- noxfile.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/noxfile.py b/noxfile.py index ec63afcb4..80de1bec1 100644 --- a/noxfile.py +++ b/noxfile.py @@ -92,6 +92,10 @@ def mypy(session): session.install("-e", ".[all]") session.install(MYPY_VERSION) + # Just install the type info directly, since "mypy --install-types" might + # require an additional pass. + session.install("types-protobuf", "types-setuptools") + # Version 2.1.1 of google-api-core version is the first type-checked release. # Version 2.2.0 of google-cloud-core version is the first type-checked release. session.install( @@ -99,12 +103,6 @@ def mypy(session): "google-cloud-core>=2.2.0", ) - # Just install the type info directly, since "mypy --install-types" might - # require an additional pass. - # Exclude types-protobuf==4.24.0.20240106 - # See https://github.com/python/typeshed/issues/11254 - session.install("types-protobuf!=4.24.0.20240106", "types-setuptools") - # TODO: Only check the hand-written layer, the generated code does not pass # mypy checks yet. # https://github.com/googleapis/gapic-generator-python/issues/1092 From a96441699b0c53c966d673a17f47b5a765b12e6d Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Mon, 22 Jan 2024 14:48:16 -0500 Subject: [PATCH 5/8] exclude types-protobuf==4.24.0.20240106 release --- owlbot.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/owlbot.py b/owlbot.py index 338687588..8c94ab8b4 100644 --- a/owlbot.py +++ b/owlbot.py @@ -366,10 +366,6 @@ def mypy(session): session.install("-e", ".[all]") session.install(MYPY_VERSION) - # Just install the type info directly, since "mypy --install-types" might - # require an additional pass. - session.install("types-protobuf", "types-setuptools") - # Version 2.1.1 of google-api-core version is the first type-checked release. # Version 2.2.0 of google-cloud-core version is the first type-checked release. session.install( @@ -377,6 +373,12 @@ def mypy(session): "google-cloud-core>=2.2.0", ) + # Just install the type info directly, since "mypy --install-types" might + # require an additional pass. + # Exclude type-protobuf==4.24.0.20240106 + # See https://github.com/python/typeshed/issues/11254 + session.install("types-protobuf!=4.24.0.20240106", "types-setuptools") + # TODO: Only check the hand-written layer, the generated code does not pass # mypy checks yet. # https://github.com/googleapis/gapic-generator-python/issues/1092 From 5253f3ede3a1f1a638ab69bb48bf4283ecefa17c Mon Sep 17 00:00:00 2001 From: Anthonios Partheniou Date: Mon, 22 Jan 2024 14:48:53 -0500 Subject: [PATCH 6/8] update replacement --- owlbot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/owlbot.py b/owlbot.py index 8c94ab8b4..0483b04df 100644 --- a/owlbot.py +++ b/owlbot.py @@ -375,7 +375,7 @@ def mypy(session): # Just install the type info directly, since "mypy --install-types" might # require an additional pass. - # Exclude type-protobuf==4.24.0.20240106 + # Exclude types-protobuf==4.24.0.20240106 # See https://github.com/python/typeshed/issues/11254 session.install("types-protobuf!=4.24.0.20240106", "types-setuptools") From c5d795320edcfe7b08469b70a5ddb15433300131 Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Mon, 22 Jan 2024 19:50:12 +0000 Subject: [PATCH 7/8] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot=20po?= =?UTF-8?q?st-processor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --- noxfile.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/noxfile.py b/noxfile.py index 80de1bec1..a00b6e0cb 100644 --- a/noxfile.py +++ b/noxfile.py @@ -92,10 +92,6 @@ def mypy(session): session.install("-e", ".[all]") session.install(MYPY_VERSION) - # Just install the type info directly, since "mypy --install-types" might - # require an additional pass. - session.install("types-protobuf", "types-setuptools") - # Version 2.1.1 of google-api-core version is the first type-checked release. # Version 2.2.0 of google-cloud-core version is the first type-checked release. session.install( @@ -103,6 +99,12 @@ def mypy(session): "google-cloud-core>=2.2.0", ) + # Just install the type info directly, since "mypy --install-types" might + # require an additional pass. + # Exclude type-protobuf==4.24.0.20240106 + # See https://github.com/python/typeshed/issues/11254 + session.install("types-protobuf!=4.24.0.20240106", "types-setuptools") + # TODO: Only check the hand-written layer, the generated code does not pass # mypy checks yet. # https://github.com/googleapis/gapic-generator-python/issues/1092 From 8f43d68bfa5aaf1a279ff127babd31a5161c385c Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Mon, 22 Jan 2024 19:51:53 +0000 Subject: [PATCH 8/8] =?UTF-8?q?=F0=9F=A6=89=20Updates=20from=20OwlBot=20po?= =?UTF-8?q?st-processor?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit See https://github.com/googleapis/repo-automation-bots/blob/main/packages/owl-bot/README.md --- noxfile.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/noxfile.py b/noxfile.py index a00b6e0cb..ec63afcb4 100644 --- a/noxfile.py +++ b/noxfile.py @@ -101,7 +101,7 @@ def mypy(session): # Just install the type info directly, since "mypy --install-types" might # require an additional pass. - # Exclude type-protobuf==4.24.0.20240106 + # Exclude types-protobuf==4.24.0.20240106 # See https://github.com/python/typeshed/issues/11254 session.install("types-protobuf!=4.24.0.20240106", "types-setuptools")