Skip to content

Commit 6a40e64

Browse files
committed
Add ni-apis submodule and remove local session.proto
1 parent 8fac88b commit 6a40e64

10 files changed

Lines changed: 18 additions & 23 deletions

.github/workflows/check_latest_release.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,8 @@ jobs:
2828
steps:
2929
- name: checkout repository
3030
uses: actions/checkout@v3
31+
with:
32+
submodules: true
3133

3234
- name: Extract module name and version from release tag
3335
id: extract_tag

.github/workflows/github_actions_aws_rhel_python64.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ jobs:
4242
steps:
4343
- name: checkout repository
4444
uses: actions/checkout@v3
45+
with:
46+
submodules: true
4547
- name: execute system tests
4648
uses: ./.github/actions/linux
4749
with:

.github/workflows/github_actions_aws_windows_python32.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,8 @@ jobs:
4545
steps:
4646
- name: checkout repository
4747
uses: actions/checkout@v3
48+
with:
49+
submodules: true
4850
- name: execute system tests
4951
uses: ./.github/actions/windows
5052
with:

.github/workflows/github_actions_aws_windows_python64.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,8 @@ jobs:
5959
steps:
6060
- name: checkout repository
6161
uses: actions/checkout@v3
62+
with:
63+
submodules: true
6264
- name: execute system tests
6365
uses: ./.github/actions/windows
6466
with:

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[submodule "third_party/ni-apis"]
2+
path = third_party/ni-apis
3+
url = https://github.com/ni/ni-apis.git

build/defines.mak

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@ DRIVER_DIR := $(ROOT_DIR)/src/$(DRIVER)
99
METADATA_DIR := $(DRIVER_DIR)/metadata
1010
METADATA_FILES := $(wildcard $(METADATA_DIR)/*.py)
1111
SHARED_PROTOS_DIR := $(ROOT_DIR)/src/shared_protos
12-
PROTO_DIRS := $(METADATA_DIR) $(SHARED_PROTOS_DIR)
12+
NI_APIS_PROTOS_DIR := $(ROOT_DIR)/third_party/ni-apis/ni/grpcdevice/v1
13+
PROTO_DIRS := $(METADATA_DIR) $(SHARED_PROTOS_DIR) $(NI_APIS_PROTOS_DIR)
1314
PROTO_FILE ?= $(METADATA_DIR)/$(DRIVER).proto
1415

1516
BUILD_HELPER_SCRIPTS := $(wildcard $(BUILD_HELPER_DIR)/*.py $(BUILD_HELPER_DIR)/helper/*.py)

src/shared_protos/session.proto

Lines changed: 0 additions & 18 deletions
This file was deleted.

third_party/ni-apis

Submodule ni-apis added at 85046c4

tox-travis.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ deps =
146146
test: hightime
147147
test: grpcio == 1.75.1 # Compatible with Python 3.14; should be backwards compatible with grpcio-tools 1.59.0
148148
test: protobuf == 5.27.2 # Compatible with Python 3.14; should be backwards compatible with grpcio-tools 1.59.0
149-
test: ni.grpcdevice.v1.proto >= 1.0.0
149+
test: ni.grpcdevice.v1.proto >= 1.0.0 # Provides session_pb2 package at runtime since we no longer generate it per-driver
150150
build_test: pytest
151151
build_test: coverage
152152
build_test: mako
@@ -186,7 +186,7 @@ show_source = true
186186
# We recommend setting your editor's visual guide to 79 but allow overflow to
187187
# 160 for readability in certain cases due to generated code
188188
# max_line_length = 160
189-
exclude = build,docs,.tox,__pycache__,processed_metadata,.eggs,*_pb2*.py
189+
exclude = build,docs,.tox,__pycache__,processed_metadata,.eggs,*_pb2*.py,third_party
190190
# H903: Windows style line endings not allowed in code
191191
# E501: Line length
192192
# W391: Blank line at end of file

tox.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ deps =
146146
test: hightime
147147
test: grpcio == 1.75.1 # Compatible with Python 3.14; should be backwards compatible with grpcio-tools 1.59.0
148148
test: protobuf == 5.27.2 # Compatible with Python 3.14; should be backwards compatible with grpcio-tools 1.59.0
149-
test: ni.grpcdevice.v1.proto >= 1.0.0
149+
test: ni.grpcdevice.v1.proto >= 1.0.0 # Provides session_pb2 package at runtime since we no longer generate it per-driver
150150
build_test: pytest
151151
build_test: coverage
152152
build_test: mako
@@ -186,7 +186,7 @@ show_source = true
186186
# We recommend setting your editor's visual guide to 79 but allow overflow to
187187
# 160 for readability in certain cases due to generated code
188188
# max_line_length = 160
189-
exclude = build,docs,.tox,__pycache__,processed_metadata,.eggs,*_pb2*.py
189+
exclude = build,docs,.tox,__pycache__,processed_metadata,.eggs,*_pb2*.py,third_party
190190
# H903: Windows style line endings not allowed in code
191191
# E501: Line length
192192
# W391: Blank line at end of file

0 commit comments

Comments
 (0)