Merge remote-tracking branch 'origin/master' into users/mprosser/bug-3178052-todos

Author: Mike Prosser

.github/workflows/build.yml

@@ -16,7 +16,7 @@ jobs:
       codegen-python-version: "3.9"
     steps:
       - name: Check out repo
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
         with:
           submodules: true
       - name: Set up Python

.github/workflows/generate_docs.yml

@@ -10,7 +10,7 @@ jobs:
       - ubuntu-latest
     steps:
       - name: Check out repo
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       - name: Set up Python
         uses: ni/python-actions/setup-python@9768589f3e50672173dad75a6fc181e4a85d33fa # v0.7.0
         id: setup-python

.github/workflows/publish.yml

@@ -43,7 +43,7 @@ jobs:
     needs: [check_nidaqmx, check_docs]
     steps:
       - name: Check out repo
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       - name: Set up Python
         uses: ni/python-actions/setup-python@9768589f3e50672173dad75a6fc181e4a85d33fa # v0.7.0
       - name: Set up Poetry
@@ -89,7 +89,7 @@ jobs:
       pull-requests: write
     steps:
       - name: Check out repo
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       - name: Set up Python
         uses: ni/python-actions/setup-python@9768589f3e50672173dad75a6fc181e4a85d33fa # v0.7.0
       - name: Set up Poetry

.github/workflows/report_test_results.yml

@@ -14,7 +14,7 @@ jobs:
       pull-requests: write
     steps:
       - name: Check out repo
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       - name: Download test results
         uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
         with:

.github/workflows/run_system_tests.yml

@@ -20,7 +20,7 @@ jobs:
     timeout-minutes: 90
     steps:
       - name: Check out repo
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       - name: Import DAQmx config
         run: C:\nidaqmxconfig\targets\win64U\x64\msvc-14.0\release\nidaqmxconfig.exe --eraseconfig --import tests\max_config\nidaqmxMaxConfig.ini
       - name: Set up Python

.github/workflows/run_unit_tests.yml

@@ -21,7 +21,7 @@ jobs:
       pytest-opts: ${{ (startsWith(matrix.python-version, 'pypy') || matrix.python-version == '3.14t') && '-k "not grpc"' || '' }}
     steps:
       - name: Check out repo
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       - name: Set up Python ${{ matrix.python-version }}
         uses: ni/python-actions/setup-python@9768589f3e50672173dad75a6fc181e4a85d33fa # v0.7.0
         id: setup-python
@@ -54,7 +54,7 @@ jobs:
         python-version: ["3.10", "3.13", "pypy3.11"]
     steps:
       - name: Check out repo
-        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       - name: Set up Python ${{ matrix.python-version }}
         uses: ni/python-actions/setup-python@9768589f3e50672173dad75a6fc181e4a85d33fa # v0.7.0
         id: setup-python

poetry.lock

@@ -68,12 +68,21 @@ nitypes = {version=">=1.1.0.dev1"}
 [tool.poetry.group.codegen.dependencies]
 Mako = "^1.2"
 grpcio-tools = [
+  # requires protobuf v4 or later
   { version = "1.49.1", python = ">=3.9,<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" },
 ]
-mypy-protobuf = ">=3.4"
+# 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.9,<3.14"},
+  # requires protobuf v6 or later
+  {version = ">=3.4", python = "^3.14"}
+]
 
 [tool.poetry.group.docs]
 optional = true
@@ -101,7 +110,7 @@ nptdms = ">=1.9.0"
 [tool.poetry.group.lint.dependencies]
 bandit = { version = ">=1.7", extras = ["toml"] }
 ni-python-styleguide = ">=0.4.1"
-mypy = ">=1.0"
+mypy = { version = ">=1.0", markers = "implementation_name != 'pypy'" }
 types-protobuf = ">=4.21"
 types-requests = ">=2.25.0"
 types-grpcio = ">=1.0"