From 53f13e7e0bf0844d53a99654ba5a119b5c9a9d9f Mon Sep 17 00:00:00 2001 From: Daniel Sanche Date: Tue, 15 Sep 2026 22:02:47 -0700 Subject: [PATCH 1/2] update noxfile template --- .../gapic-generator/gapic/templates/noxfile.py.j2 | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/packages/gapic-generator/gapic/templates/noxfile.py.j2 b/packages/gapic-generator/gapic/templates/noxfile.py.j2 index 0cd2aa9878fb..2464d0653f07 100644 --- a/packages/gapic-generator/gapic/templates/noxfile.py.j2 +++ b/packages/gapic-generator/gapic/templates/noxfile.py.j2 @@ -482,7 +482,11 @@ def prerelease_deps(session, protobuf_implementation): session.install("-e", ".") # Install dependencies for the unit test environment - unit_deps_all = UNIT_TEST_STANDARD_DEPENDENCIES + UNIT_TEST_EXTERNAL_DEPENDENCIES + unit_deps_all = ( + UNIT_TEST_STANDARD_DEPENDENCIES + + UNIT_TEST_DEPENDENCIES + + UNIT_TEST_EXTERNAL_DEPENDENCIES + ) session.install(*unit_deps_all) # Because we test minimum dependency versions on the minimum Python @@ -597,7 +601,11 @@ def core_deps_from_source(session, protobuf_implementation): session.install("-e", ".") # Install dependencies for the unit test environment - unit_deps_all = UNIT_TEST_STANDARD_DEPENDENCIES + UNIT_TEST_EXTERNAL_DEPENDENCIES + unit_deps_all = ( + UNIT_TEST_STANDARD_DEPENDENCIES + + UNIT_TEST_DEPENDENCIES + + UNIT_TEST_EXTERNAL_DEPENDENCIES + ) session.install(*unit_deps_all) # Because we test minimum dependency versions on the minimum Python From 83a0eb6031987d4bdeb7f0a687c58e6447f659c8 Mon Sep 17 00:00:00 2001 From: Daniel Sanche Date: Tue, 15 Sep 2026 22:03:18 -0700 Subject: [PATCH 2/2] update goldens --- .../tests/integration/goldens/asset/noxfile.py | 12 ++++++++++-- .../tests/integration/goldens/credentials/noxfile.py | 12 ++++++++++-- .../tests/integration/goldens/eventarc/noxfile.py | 12 ++++++++++-- .../tests/integration/goldens/logging/noxfile.py | 12 ++++++++++-- .../integration/goldens/logging_internal/noxfile.py | 12 ++++++++++-- .../tests/integration/goldens/redis/noxfile.py | 12 ++++++++++-- .../integration/goldens/redis_selective/noxfile.py | 12 ++++++++++-- .../goldens/storagebatchoperations/noxfile.py | 12 ++++++++++-- 8 files changed, 80 insertions(+), 16 deletions(-) diff --git a/packages/gapic-generator/tests/integration/goldens/asset/noxfile.py b/packages/gapic-generator/tests/integration/goldens/asset/noxfile.py index 34af0d25e9e9..87372f93db86 100755 --- a/packages/gapic-generator/tests/integration/goldens/asset/noxfile.py +++ b/packages/gapic-generator/tests/integration/goldens/asset/noxfile.py @@ -474,7 +474,11 @@ def prerelease_deps(session, protobuf_implementation): session.install("-e", ".") # Install dependencies for the unit test environment - unit_deps_all = UNIT_TEST_STANDARD_DEPENDENCIES + UNIT_TEST_EXTERNAL_DEPENDENCIES + unit_deps_all = ( + UNIT_TEST_STANDARD_DEPENDENCIES + + UNIT_TEST_DEPENDENCIES + + UNIT_TEST_EXTERNAL_DEPENDENCIES + ) session.install(*unit_deps_all) # Because we test minimum dependency versions on the minimum Python @@ -589,7 +593,11 @@ def core_deps_from_source(session, protobuf_implementation): session.install("-e", ".") # Install dependencies for the unit test environment - unit_deps_all = UNIT_TEST_STANDARD_DEPENDENCIES + UNIT_TEST_EXTERNAL_DEPENDENCIES + unit_deps_all = ( + UNIT_TEST_STANDARD_DEPENDENCIES + + UNIT_TEST_DEPENDENCIES + + UNIT_TEST_EXTERNAL_DEPENDENCIES + ) session.install(*unit_deps_all) # Because we test minimum dependency versions on the minimum Python diff --git a/packages/gapic-generator/tests/integration/goldens/credentials/noxfile.py b/packages/gapic-generator/tests/integration/goldens/credentials/noxfile.py index e114571f4d9e..791b93813e03 100755 --- a/packages/gapic-generator/tests/integration/goldens/credentials/noxfile.py +++ b/packages/gapic-generator/tests/integration/goldens/credentials/noxfile.py @@ -474,7 +474,11 @@ def prerelease_deps(session, protobuf_implementation): session.install("-e", ".") # Install dependencies for the unit test environment - unit_deps_all = UNIT_TEST_STANDARD_DEPENDENCIES + UNIT_TEST_EXTERNAL_DEPENDENCIES + unit_deps_all = ( + UNIT_TEST_STANDARD_DEPENDENCIES + + UNIT_TEST_DEPENDENCIES + + UNIT_TEST_EXTERNAL_DEPENDENCIES + ) session.install(*unit_deps_all) # Because we test minimum dependency versions on the minimum Python @@ -589,7 +593,11 @@ def core_deps_from_source(session, protobuf_implementation): session.install("-e", ".") # Install dependencies for the unit test environment - unit_deps_all = UNIT_TEST_STANDARD_DEPENDENCIES + UNIT_TEST_EXTERNAL_DEPENDENCIES + unit_deps_all = ( + UNIT_TEST_STANDARD_DEPENDENCIES + + UNIT_TEST_DEPENDENCIES + + UNIT_TEST_EXTERNAL_DEPENDENCIES + ) session.install(*unit_deps_all) # Because we test minimum dependency versions on the minimum Python diff --git a/packages/gapic-generator/tests/integration/goldens/eventarc/noxfile.py b/packages/gapic-generator/tests/integration/goldens/eventarc/noxfile.py index fe6219825d35..75df30bfc86d 100755 --- a/packages/gapic-generator/tests/integration/goldens/eventarc/noxfile.py +++ b/packages/gapic-generator/tests/integration/goldens/eventarc/noxfile.py @@ -474,7 +474,11 @@ def prerelease_deps(session, protobuf_implementation): session.install("-e", ".") # Install dependencies for the unit test environment - unit_deps_all = UNIT_TEST_STANDARD_DEPENDENCIES + UNIT_TEST_EXTERNAL_DEPENDENCIES + unit_deps_all = ( + UNIT_TEST_STANDARD_DEPENDENCIES + + UNIT_TEST_DEPENDENCIES + + UNIT_TEST_EXTERNAL_DEPENDENCIES + ) session.install(*unit_deps_all) # Because we test minimum dependency versions on the minimum Python @@ -589,7 +593,11 @@ def core_deps_from_source(session, protobuf_implementation): session.install("-e", ".") # Install dependencies for the unit test environment - unit_deps_all = UNIT_TEST_STANDARD_DEPENDENCIES + UNIT_TEST_EXTERNAL_DEPENDENCIES + unit_deps_all = ( + UNIT_TEST_STANDARD_DEPENDENCIES + + UNIT_TEST_DEPENDENCIES + + UNIT_TEST_EXTERNAL_DEPENDENCIES + ) session.install(*unit_deps_all) # Because we test minimum dependency versions on the minimum Python diff --git a/packages/gapic-generator/tests/integration/goldens/logging/noxfile.py b/packages/gapic-generator/tests/integration/goldens/logging/noxfile.py index e15c0cf8129f..6955f4cfe4d3 100755 --- a/packages/gapic-generator/tests/integration/goldens/logging/noxfile.py +++ b/packages/gapic-generator/tests/integration/goldens/logging/noxfile.py @@ -474,7 +474,11 @@ def prerelease_deps(session, protobuf_implementation): session.install("-e", ".") # Install dependencies for the unit test environment - unit_deps_all = UNIT_TEST_STANDARD_DEPENDENCIES + UNIT_TEST_EXTERNAL_DEPENDENCIES + unit_deps_all = ( + UNIT_TEST_STANDARD_DEPENDENCIES + + UNIT_TEST_DEPENDENCIES + + UNIT_TEST_EXTERNAL_DEPENDENCIES + ) session.install(*unit_deps_all) # Because we test minimum dependency versions on the minimum Python @@ -589,7 +593,11 @@ def core_deps_from_source(session, protobuf_implementation): session.install("-e", ".") # Install dependencies for the unit test environment - unit_deps_all = UNIT_TEST_STANDARD_DEPENDENCIES + UNIT_TEST_EXTERNAL_DEPENDENCIES + unit_deps_all = ( + UNIT_TEST_STANDARD_DEPENDENCIES + + UNIT_TEST_DEPENDENCIES + + UNIT_TEST_EXTERNAL_DEPENDENCIES + ) session.install(*unit_deps_all) # Because we test minimum dependency versions on the minimum Python diff --git a/packages/gapic-generator/tests/integration/goldens/logging_internal/noxfile.py b/packages/gapic-generator/tests/integration/goldens/logging_internal/noxfile.py index e15c0cf8129f..6955f4cfe4d3 100755 --- a/packages/gapic-generator/tests/integration/goldens/logging_internal/noxfile.py +++ b/packages/gapic-generator/tests/integration/goldens/logging_internal/noxfile.py @@ -474,7 +474,11 @@ def prerelease_deps(session, protobuf_implementation): session.install("-e", ".") # Install dependencies for the unit test environment - unit_deps_all = UNIT_TEST_STANDARD_DEPENDENCIES + UNIT_TEST_EXTERNAL_DEPENDENCIES + unit_deps_all = ( + UNIT_TEST_STANDARD_DEPENDENCIES + + UNIT_TEST_DEPENDENCIES + + UNIT_TEST_EXTERNAL_DEPENDENCIES + ) session.install(*unit_deps_all) # Because we test minimum dependency versions on the minimum Python @@ -589,7 +593,11 @@ def core_deps_from_source(session, protobuf_implementation): session.install("-e", ".") # Install dependencies for the unit test environment - unit_deps_all = UNIT_TEST_STANDARD_DEPENDENCIES + UNIT_TEST_EXTERNAL_DEPENDENCIES + unit_deps_all = ( + UNIT_TEST_STANDARD_DEPENDENCIES + + UNIT_TEST_DEPENDENCIES + + UNIT_TEST_EXTERNAL_DEPENDENCIES + ) session.install(*unit_deps_all) # Because we test minimum dependency versions on the minimum Python diff --git a/packages/gapic-generator/tests/integration/goldens/redis/noxfile.py b/packages/gapic-generator/tests/integration/goldens/redis/noxfile.py index 74fe2c4c00ca..43f67b01ddf7 100755 --- a/packages/gapic-generator/tests/integration/goldens/redis/noxfile.py +++ b/packages/gapic-generator/tests/integration/goldens/redis/noxfile.py @@ -474,7 +474,11 @@ def prerelease_deps(session, protobuf_implementation): session.install("-e", ".") # Install dependencies for the unit test environment - unit_deps_all = UNIT_TEST_STANDARD_DEPENDENCIES + UNIT_TEST_EXTERNAL_DEPENDENCIES + unit_deps_all = ( + UNIT_TEST_STANDARD_DEPENDENCIES + + UNIT_TEST_DEPENDENCIES + + UNIT_TEST_EXTERNAL_DEPENDENCIES + ) session.install(*unit_deps_all) # Because we test minimum dependency versions on the minimum Python @@ -589,7 +593,11 @@ def core_deps_from_source(session, protobuf_implementation): session.install("-e", ".") # Install dependencies for the unit test environment - unit_deps_all = UNIT_TEST_STANDARD_DEPENDENCIES + UNIT_TEST_EXTERNAL_DEPENDENCIES + unit_deps_all = ( + UNIT_TEST_STANDARD_DEPENDENCIES + + UNIT_TEST_DEPENDENCIES + + UNIT_TEST_EXTERNAL_DEPENDENCIES + ) session.install(*unit_deps_all) # Because we test minimum dependency versions on the minimum Python diff --git a/packages/gapic-generator/tests/integration/goldens/redis_selective/noxfile.py b/packages/gapic-generator/tests/integration/goldens/redis_selective/noxfile.py index 74fe2c4c00ca..43f67b01ddf7 100755 --- a/packages/gapic-generator/tests/integration/goldens/redis_selective/noxfile.py +++ b/packages/gapic-generator/tests/integration/goldens/redis_selective/noxfile.py @@ -474,7 +474,11 @@ def prerelease_deps(session, protobuf_implementation): session.install("-e", ".") # Install dependencies for the unit test environment - unit_deps_all = UNIT_TEST_STANDARD_DEPENDENCIES + UNIT_TEST_EXTERNAL_DEPENDENCIES + unit_deps_all = ( + UNIT_TEST_STANDARD_DEPENDENCIES + + UNIT_TEST_DEPENDENCIES + + UNIT_TEST_EXTERNAL_DEPENDENCIES + ) session.install(*unit_deps_all) # Because we test minimum dependency versions on the minimum Python @@ -589,7 +593,11 @@ def core_deps_from_source(session, protobuf_implementation): session.install("-e", ".") # Install dependencies for the unit test environment - unit_deps_all = UNIT_TEST_STANDARD_DEPENDENCIES + UNIT_TEST_EXTERNAL_DEPENDENCIES + unit_deps_all = ( + UNIT_TEST_STANDARD_DEPENDENCIES + + UNIT_TEST_DEPENDENCIES + + UNIT_TEST_EXTERNAL_DEPENDENCIES + ) session.install(*unit_deps_all) # Because we test minimum dependency versions on the minimum Python diff --git a/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/noxfile.py b/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/noxfile.py index 21481d82a4b5..17d431fe191c 100755 --- a/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/noxfile.py +++ b/packages/gapic-generator/tests/integration/goldens/storagebatchoperations/noxfile.py @@ -474,7 +474,11 @@ def prerelease_deps(session, protobuf_implementation): session.install("-e", ".") # Install dependencies for the unit test environment - unit_deps_all = UNIT_TEST_STANDARD_DEPENDENCIES + UNIT_TEST_EXTERNAL_DEPENDENCIES + unit_deps_all = ( + UNIT_TEST_STANDARD_DEPENDENCIES + + UNIT_TEST_DEPENDENCIES + + UNIT_TEST_EXTERNAL_DEPENDENCIES + ) session.install(*unit_deps_all) # Because we test minimum dependency versions on the minimum Python @@ -589,7 +593,11 @@ def core_deps_from_source(session, protobuf_implementation): session.install("-e", ".") # Install dependencies for the unit test environment - unit_deps_all = UNIT_TEST_STANDARD_DEPENDENCIES + UNIT_TEST_EXTERNAL_DEPENDENCIES + unit_deps_all = ( + UNIT_TEST_STANDARD_DEPENDENCIES + + UNIT_TEST_DEPENDENCIES + + UNIT_TEST_EXTERNAL_DEPENDENCIES + ) session.install(*unit_deps_all) # Because we test minimum dependency versions on the minimum Python