From 2be51ad072891bcc56dfc256f466e2aeea801ab3 Mon Sep 17 00:00:00 2001 From: Linchin Date: Wed, 5 Nov 2025 19:58:13 +0000 Subject: [PATCH 1/8] test: remove python 3.7 and 3.8 from noxfile unit tests --- noxfile.py | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/noxfile.py b/noxfile.py index e41ee6c..08222fd 100644 --- a/noxfile.py +++ b/noxfile.py @@ -72,7 +72,12 @@ CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute() nox.options.sessions = [ - "unit", + "unit-3.9", + "unit-3.10", + "unit-3.11", + "unit-3.12", + "unit-3.13", + "unit-3.14", "system", "cover", "lint", @@ -176,6 +181,9 @@ def install_unittest_dependencies(session, *constraints): def unit(session, protobuf_implementation): # Install all test dependencies, then install this package in-place. + if session.python in ("3.7", "3.8") and os.environ.get("TRAMPOLINE_IMAGE"): + session.skip("skipping Python 3.7 and 3.8 in kokoro tests") + if protobuf_implementation == "cpp" and session.python in ( "3.11", "3.12", @@ -487,4 +495,4 @@ def prerelease_deps(session, protobuf_implementation): env={ "PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION": protobuf_implementation, }, - ) + ) \ No newline at end of file From 47d65fed4f5cb7d1b7ab5cce57688df451cbfb56 Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Wed, 5 Nov 2025 20:00:47 +0000 Subject: [PATCH 2/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 | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/noxfile.py b/noxfile.py index 08222fd..e41ee6c 100644 --- a/noxfile.py +++ b/noxfile.py @@ -72,12 +72,7 @@ CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute() nox.options.sessions = [ - "unit-3.9", - "unit-3.10", - "unit-3.11", - "unit-3.12", - "unit-3.13", - "unit-3.14", + "unit", "system", "cover", "lint", @@ -181,9 +176,6 @@ def install_unittest_dependencies(session, *constraints): def unit(session, protobuf_implementation): # Install all test dependencies, then install this package in-place. - if session.python in ("3.7", "3.8") and os.environ.get("TRAMPOLINE_IMAGE"): - session.skip("skipping Python 3.7 and 3.8 in kokoro tests") - if protobuf_implementation == "cpp" and session.python in ( "3.11", "3.12", @@ -495,4 +487,4 @@ def prerelease_deps(session, protobuf_implementation): env={ "PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION": protobuf_implementation, }, - ) \ No newline at end of file + ) From 03d153b89a63dd436048a42eb26fc1ecf3646d74 Mon Sep 17 00:00:00 2001 From: Linchin Date: Wed, 5 Nov 2025 20:06:07 +0000 Subject: [PATCH 3/8] undo owlbot change --- noxfile.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/noxfile.py b/noxfile.py index e41ee6c..bedf79c 100644 --- a/noxfile.py +++ b/noxfile.py @@ -72,7 +72,12 @@ CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute() nox.options.sessions = [ - "unit", + "unit-3.9", + "unit-3.10", + "unit-3.11", + "unit-3.12", + "unit-3.13", + "unit-3.14", "system", "cover", "lint", From 851e6893d15dcef124d4a668020295d65f6f8ced Mon Sep 17 00:00:00 2001 From: Linchin Date: Wed, 5 Nov 2025 20:30:50 +0000 Subject: [PATCH 4/8] add owlbot string replacement --- owlbot.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/owlbot.py b/owlbot.py index f183bb8..ed02b16 100644 --- a/owlbot.py +++ b/owlbot.py @@ -39,6 +39,21 @@ 'session.python in ("3.11", "3.12", "3.13", "3.14")' ) +s.replace( + "noxfile.py", + """nox.options.sessions = [ + "unit", + """, + """nox.options.sessions = [ + "unit-3.9", + "unit-3.10", + "unit-3.11", + "unit-3.12", + "unit-3.13", + "unit-3.14", + """, +) + s.replace( ".kokoro/presubmit/presubmit.cfg", """# Format: //devtools/kokoro/config/proto/build.proto""", From 6a2c030bc3b11435c61296606593863167aa245d Mon Sep 17 00:00:00 2001 From: Linchin Date: Wed, 5 Nov 2025 20:55:06 +0000 Subject: [PATCH 5/8] correct regex --- owlbot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/owlbot.py b/owlbot.py index ed02b16..d107bdf 100644 --- a/owlbot.py +++ b/owlbot.py @@ -41,7 +41,7 @@ s.replace( "noxfile.py", - """nox.options.sessions = [ + """nox.options.sessions = \[ "unit", """, """nox.options.sessions = [ From 3a2a9c6bb976d900c70fb3a0f89df4e912f10e94 Mon Sep 17 00:00:00 2001 From: Owl Bot Date: Wed, 5 Nov 2025 20:56:50 +0000 Subject: [PATCH 6/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 | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/noxfile.py b/noxfile.py index bedf79c..e41ee6c 100644 --- a/noxfile.py +++ b/noxfile.py @@ -72,12 +72,7 @@ CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute() nox.options.sessions = [ - "unit-3.9", - "unit-3.10", - "unit-3.11", - "unit-3.12", - "unit-3.13", - "unit-3.14", + "unit", "system", "cover", "lint", From bc9817ef3d6600562e9dfb0dd718ad6ee8364a1d Mon Sep 17 00:00:00 2001 From: Linchin Date: Wed, 5 Nov 2025 20:59:57 +0000 Subject: [PATCH 7/8] correct regex --- owlbot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/owlbot.py b/owlbot.py index d107bdf..d534f43 100644 --- a/owlbot.py +++ b/owlbot.py @@ -41,7 +41,7 @@ s.replace( "noxfile.py", - """nox.options.sessions = \[ + """nox\.options\.sessions = \[ "unit", """, """nox.options.sessions = [ From b0c1332bfc9f5e4fc011b1fe26753c9ba0a6cb98 Mon Sep 17 00:00:00 2001 From: Linchin Date: Wed, 5 Nov 2025 22:09:48 +0000 Subject: [PATCH 8/8] modify noxfile --- noxfile.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/noxfile.py b/noxfile.py index e41ee6c..bedf79c 100644 --- a/noxfile.py +++ b/noxfile.py @@ -72,7 +72,12 @@ CURRENT_DIRECTORY = pathlib.Path(__file__).parent.absolute() nox.options.sessions = [ - "unit", + "unit-3.9", + "unit-3.10", + "unit-3.11", + "unit-3.12", + "unit-3.13", + "unit-3.14", "system", "cover", "lint",