Skip to content

Commit 6f8f665

Browse files
Mike ProsserMike Prosser
authored andcommitted
rename the proto files
1 parent c743f5a commit 6f8f665

29 files changed

+295
-313
lines changed

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,8 @@ See [GitHub's official documentation](https://help.github.com/articles/using-pul
2121

2222
# Getting Started
2323

24-
This is the command to generate the files in /src/ni/pythonpanel/v1/:
25-
`poetry run python -m grpc_tools.protoc --proto_path=protos --python_out=src/ --grpc_python_out=src/ --mypy_out=src/ --mypy_grpc_out=src/ ni/pythonpanel/v1/python_panel_service.proto`
24+
This is the command to generate the files in /src/ni/panels/v1/:
25+
`poetry run python -m grpc_tools.protoc --proto_path=protos --python_out=src/ --grpc_python_out=src/ --mypy_out=src/ --mypy_grpc_out=src/ ni/panels/v1/panel_service.proto ni/panels/v1/panel_types.proto`
2626

2727
# Testing
2828

protos/ni/pythonpanel/v1/python_panel_service.proto renamed to protos/ni/panels/v1/panel_service.proto

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,21 @@
11
syntax = "proto3";
22

3-
package ni.pythonpanel.v1;
3+
package ni.panels.v1;
44

55
import "google/protobuf/any.proto";
66

77
option cc_enable_arenas = true;
8-
option csharp_namespace = "NationalInstruments.PythonPanel.V1";
9-
option go_package = "pythonpanelv1";
8+
option csharp_namespace = "NationalInstruments.Panels.V1";
9+
option go_package = "panelsv1";
1010
option java_multiple_files = true;
11-
option java_outer_classname = "PythonPanelServiceProto";
12-
option java_package = "com.ni.pythonpanel.v1";
13-
option objc_class_prefix = "NIPP";
14-
option php_namespace = "NI\\PythonPanel\\V1";
15-
option ruby_package = "NI::PythonPanel::V1";
16-
17-
// Service interface for interacting with python panels
18-
service PythonPanelService {
11+
option java_outer_classname = "PanelsProto";
12+
option java_package = "com.ni.panels.v1";
13+
option objc_class_prefix = "NIPS";
14+
option php_namespace = "NI\\Panels\\V1";
15+
option ruby_package = "NI::Panels::V1";
16+
17+
// Service interface for interacting with NI panels
18+
service PanelService {
1919
// Start a panel using the provided configuration (or connect to if it has already been started)
2020
// Status Codes for errors:
2121
// - INVALID_ARGUMENT:

protos/ni/pythonpanel/v1/python_panel_types.proto renamed to protos/ni/panels/v1/panel_types.proto

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
syntax = "proto3";
22

3-
package ni.pythonpanel.v1;
3+
package ni.panels.v1;
44

55
option cc_enable_arenas = true;
6-
option csharp_namespace = "NationalInstruments.PythonPanel.V1";
7-
option go_package = "pythonpanelv1";
6+
option csharp_namespace = "NationalInstruments.Panels.V1";
7+
option go_package = "panelsv1";
88
option java_multiple_files = true;
9-
option java_outer_classname = "PythonPanelServiceProto";
10-
option java_package = "com.ni.pythonpanel.v1";
11-
option objc_class_prefix = "NIPP";
12-
option php_namespace = "NI\\PythonPanel\\V1";
13-
option ruby_package = "NI::PythonPanel::V1";
9+
option java_outer_classname = "PanelsProto";
10+
option java_package = "com.ni.panels.v1";
11+
option objc_class_prefix = "NIPS";
12+
option php_namespace = "NI\\Panels\\V1";
13+
option ruby_package = "NI::Panels::V1";
1414

1515
message BoolCollection {
1616
repeated bool values = 1;

pyproject.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,10 @@ requires = ["poetry-core>=1.8.0"]
7171
build-backend = "poetry.core.masonry.api"
7272

7373
[tool.ni-python-styleguide]
74-
extend_exclude = ".tox,docs,src/ni/pythonpanel/v1,src/ni/protobuf/types/"
74+
extend_exclude = ".tox,docs,src/ni/panels/v1,src/ni/protobuf/types/"
7575

7676
[tool.black]
77-
extend-exclude = '\.tox/|docs/|src/ni/pythonpanel/v1/|src/ni/protobuf/types/'
77+
extend-exclude = '\.tox/|docs/|src/ni/panels/v1/|src/ni/protobuf/types/'
7878
line-length = 100
7979

8080
[tool.mypy]
@@ -104,4 +104,4 @@ testpaths = ["src/nipanel", "tests"]
104104

105105
[tool.pyright]
106106
include = ["examples/", "src/", "tests/"]
107-
exclude = ["src/ni/protobuf/types/", "src/ni/pythonpanel/v1/","examples/nidaqmx/nidaqmx_continuous_analog_input.py","examples/niscope/niscope_ex_fetch_forever.py"]
107+
exclude = ["src/ni/protobuf/types/", "src/ni/panels/v1/","examples/nidaqmx/nidaqmx_continuous_analog_input.py","examples/niscope/niscope_ex_fetch_forever.py"]

src/ni/panels/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
"""gRPC stubs for NI Panels."""

src/ni/panels/v1/__init__.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
"""gRPC client for NI Panels."""

src/ni/panels/v1/panel_service_pb2.py

Lines changed: 55 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)