From 2e24b3be9575d0e2117a2eb8d2412717e7613eb8 Mon Sep 17 00:00:00 2001
From: Brad Keryan <brad.keryan@ni.com>
Date: Mon, 8 Dec 2025 17:30:42 -0600
Subject: [PATCH 1/2] fix(deps): Rework mypy-protobuf dependencies so Renovate
 won't upgrade the version we use for codegen

---
 packages/generator/pyproject.toml | 8 +++++++-
 packages/service/pyproject.toml   | 8 +++++++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/packages/generator/pyproject.toml b/packages/generator/pyproject.toml
index b5cb026dc..ed25aab08 100644
--- a/packages/generator/pyproject.toml
+++ b/packages/generator/pyproject.toml
@@ -39,7 +39,10 @@ pytest-cov = ">=3.0.0"
 ni-python-styleguide = ">=0.4.1"
 mypy = ">=1.0"
 # mypy-protobuf 3.6 is the last version that supports protobuf v4.
-mypy-protobuf = ">=3.4,<3.7"
+mypy-protobuf = [
+  {version = ">=3.4,<3.7", python = ">=3.10,<3.14"},
+  {version = ">=3.4", python = "^3.14"}
+]
 types-protobuf = ">=4.21"
 types-grpcio = ">=1.0"
 # During development, use file paths to reference the latest source for packages
@@ -48,9 +51,12 @@ ni-measurement-plugin-sdk-service = {path = "../../packages/service", develop =
 bandit = { version = ">=1.7", extras = ["toml"] }
 tox = ">=4.0"
 grpcio-tools = [
+  # requires protobuf v4 or later
   {version = "1.49.1", python = ">=3.10,<3.12"},
   {version = "1.59.0", python = ">=3.12,<3.13"},
+  # requires protobuf v5 or later
   {version = "1.67.0", python = ">=3.13,<3.14"},
+  # requires protobuf v6 or later
   {version = "1.75.1", python = "^3.14"},
 ]
 # NumPy dropped support for Python 3.8 before adding support for Python 3.12, so
diff --git a/packages/service/pyproject.toml b/packages/service/pyproject.toml
index da4fb526a..19082488b 100644
--- a/packages/service/pyproject.toml
+++ b/packages/service/pyproject.toml
@@ -75,9 +75,12 @@ ni-python-styleguide = ">=0.4.1"
 # When you update the grpcio-tools version, you should update the minimum grpcio version
 # and regenerate gRPC stubs.
 grpcio-tools = [
+  # requires protobuf v4 or later
   { version = "1.49.1", python = ">=3.10,<3.12" },
   { version = "1.59.0", python = ">=3.12,<3.13" },
+  # requires protobuf v5 or later
   { version = "1.67.0", python = ">=3.13,<3.14" },
+  # requires protobuf v6 or later
   { version = "1.75.1", python = "^3.14" },
 ]
 pytest-cov = ">=3.0.0"
@@ -85,7 +88,10 @@ pytest-mock = ">=3.0"
 tox = ">=4.0"
 mypy = ">=1.0"
 # mypy-protobuf 3.6 is the last version that supports protobuf v4.
-mypy-protobuf = ">=3.4,<3.7"
+mypy-protobuf = [
+  {version = ">=3.4,<3.7", python = ">=3.10,<3.14"},
+  {version = ">=3.4", python = "^3.14"}
+]
 types-protobuf = ">=4.21"
 types-setuptools = "*"
 types-pywin32 = ">=304"

From d9b76bd9ff5b86ec515d84369764ae58cffab12f Mon Sep 17 00:00:00 2001
From: Brad Keryan <brad.keryan@ni.com>
Date: Mon, 8 Dec 2025 17:31:18 -0600
Subject: [PATCH 2/2] chore: Update poetry.lock

---
 packages/generator/poetry.lock    | 2 +-
 packages/generator/pyproject.toml | 2 ++
 packages/service/poetry.lock      | 2 +-
 packages/service/pyproject.toml   | 2 ++
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/generator/poetry.lock b/packages/generator/poetry.lock
index 8c2b97809..e8f0272d5 100644
--- a/packages/generator/poetry.lock
+++ b/packages/generator/poetry.lock
@@ -2139,4 +2139,4 @@ test = ["covdefaults (>=2.3)", "coverage (>=7.2.7)", "coverage-enable-subprocess
 [metadata]
 lock-version = "2.1"
 python-versions = "^3.10"
-content-hash = "68f047c7c07a1dc37690b51bcfd5e274c7ec314e12185aef5987a7ad3b018b87"
+content-hash = "b2f64c555e4d71bbceb76c12d54ae0a02d0b3a0e5914005c1929d94dbcd9fb17"
diff --git a/packages/generator/pyproject.toml b/packages/generator/pyproject.toml
index ed25aab08..5f6140660 100644
--- a/packages/generator/pyproject.toml
+++ b/packages/generator/pyproject.toml
@@ -40,7 +40,9 @@ ni-python-styleguide = ">=0.4.1"
 mypy = ">=1.0"
 # mypy-protobuf 3.6 is the last version that supports protobuf v4.
 mypy-protobuf = [
+  # requires protobuf v4 or later
   {version = ">=3.4,<3.7", python = ">=3.10,<3.14"},
+  # requires protobuf v6 or later
   {version = ">=3.4", python = "^3.14"}
 ]
 types-protobuf = ">=4.21"
diff --git a/packages/service/poetry.lock b/packages/service/poetry.lock
index 1e1179a35..a87ca1026 100644
--- a/packages/service/poetry.lock
+++ b/packages/service/poetry.lock
@@ -2988,4 +2988,4 @@ niswitch = ["niswitch"]
 [metadata]
 lock-version = "2.1"
 python-versions = "^3.10"
-content-hash = "1c580fbcae87d451dcf28891267fced8767eb860fd726a146cbeed475eba2e46"
+content-hash = "569000f4897cad2fc5cdbfc5129405ca1917678f8b3d9cb2bc1dffa24f9c75c0"
diff --git a/packages/service/pyproject.toml b/packages/service/pyproject.toml
index 19082488b..004901e80 100644
--- a/packages/service/pyproject.toml
+++ b/packages/service/pyproject.toml
@@ -89,7 +89,9 @@ tox = ">=4.0"
 mypy = ">=1.0"
 # mypy-protobuf 3.6 is the last version that supports protobuf v4.
 mypy-protobuf = [
+  # requires protobuf v4 or later
   {version = ">=3.4,<3.7", python = ">=3.10,<3.14"},
+  # requires protobuf v6 or later
   {version = ">=3.4", python = "^3.14"}
 ]
 types-protobuf = ">=4.21"