Skip to content

Commit 549820c

Browse files
kse3hikse3hi
authored
Upgrade protobuf and grpcio (#99)
1 parent 84e7cf2 commit 549820c

15 files changed

+502
-515
lines changed

‎.vscode/launch.json

+4-2
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,8 @@
1717
"SDV_MQTT_ADDRESS": "mqtt://localhost:1883",
1818
"SDV_HVACSERVICE_ADDRESS": "grpc://localhost:50052",
1919
"SDV_SEATSERVICE_ADDRESS": "grpc://localhost:50051",
20-
"SDV_VEHICLEDATABROKER_ADDRESS": "grpc://localhost:55555"
20+
"SDV_VEHICLEDATABROKER_ADDRESS": "grpc://localhost:55555",
21+
"PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION": "python"
2122
}
2223
},
2324
{
@@ -35,7 +36,8 @@
3536
"DAPR_HTTP_PORT": "3500",
3637
"HVACSERVICE_DAPR_APP_ID": "hvacservice",
3738
"SEATSERVICE_DAPR_APP_ID": "seatservice",
38-
"VEHICLEDATABROKER_DAPR_APP_ID": "vehicledatabroker"
39+
"VEHICLEDATABROKER_DAPR_APP_ID": "vehicledatabroker",
40+
"PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION": "python"
3941
}
4042
}
4143
],

‎CONTRIBUTING.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -77,19 +77,19 @@ In this project, the [pip-tools](https://github.com/jazzband/pip-tools) are used
7777

7878
The required pip-based dependencies of this project are defined in the [setup.py](./setup.py). All runtime dependencies are listed in the `"install_requires"` while the development dependencies are listed in the `[dev]` section of the `"extras_require"`. In other words:
7979
* The requirements that are defined in the `"install_requires"` are only installed when using the Vehicle app SDK as a runtime dependency for vehicle app development.
80-
* The requirements that are defined in the `"extras_require[dev]"` are installed for the contribution of the Vehicle app SDK development within the dev-container or in a dedicated virtual environments. This list consists of all the neccessary runtime, testing and development tools packages and need to be installed before start contributing to the project.
80+
* The requirements that are defined in the `"extras_require[dev]"` are installed for the contribution of the Vehicle app SDK development within the dev-container or in a dedicated virtual environments. This list consists of all the necessary runtime, testing and development tools packages and need to be installed before start contributing to the project.
8181

8282
The process for the dependency management of this project can be summarized as following:
83-
* The `pip-compile` tool will generate the [requirements.txt](./requirements.txt). By executing this tools, the `"requirements.txt"` file will be updated with all underlying dependencies. The command below shall be executed everytime a new python package is added to the project and/or to bump the package versions.
83+
* The `pip-compile` tool will generate the [requirements.txt](./requirements.txt). By executing this tools, the `"requirements.txt"` file will be updated with all underlying dependencies. The command below shall be executed every time a new python package is added to the project and/or to bump the package versions.
8484

8585
```bash
8686
pip-compile --extra=dev
8787
```
88-
* Please run the `pip-compile` with `-U` flag in order to force update all packages with the latest versions. However, you need to make sure when force updating all packages that everyting works as expected.
88+
* Please run the `pip-compile` with `-U` flag in order to force update all packages with the latest versions. However, you need to make sure when force updating all packages that everything works as expected.
8989
```bash
9090
pip-compile --extra=dev -U
9191
```
92-
* Run `pip-sync` or `pip install` to install the required dependencies from the [requirements.txt](./requirements.txt) alternativly.
92+
* Run `pip-sync` or `pip install` to install the required dependencies from the [requirements.txt](./requirements.txt) alternatively.
9393
```bash
9494
pip-sync
9595
```

‎NOTICE-3RD-PARTY-CONTENT.md

+62-64
Original file line numberDiff line numberDiff line change
@@ -3,95 +3,93 @@
33
## Python
44
| Dependency | Version | License |
55
|:-----------|:-------:|--------:|
6-
|aiohttp|3.8.3|Apache 2.0|
6+
|aiohttp|3.8.5|Apache 2.0|
77
|aiosignal|1.3.1|Apache 2.0|
8-
|APScheduler|3.10.1|MIT|
9-
|async-timeout|4.0.2|Apache 2.0|
10-
|attrs|22.1.0|MIT|
8+
|APScheduler|3.10.4|MIT|
9+
|async-timeout|4.0.3|Apache 2.0|
10+
|attrs|23.1.0|MIT|
1111
|bandit|1.7.5|Apache 2.0|
12-
|black|23.3.0|MIT|
12+
|black|23.7.0|MIT|
1313
|build|0.10.0|MIT|
14-
|cachetools|5.3.0|MIT|
15-
|cfgv|3.3.1|MIT|
16-
|chardet|5.1.0|LGPL|
17-
|charset-normalizer|2.1.1|MIT|
18-
|click|8.1.3|New BSD|
14+
|cachetools|5.3.1|MIT|
15+
|cfgv|3.4.0|MIT|
16+
|chardet|5.2.0|LGPL|
17+
|charset-normalizer|3.2.0|MIT|
18+
|click|8.1.7|New BSD|
1919
|cloudevents|1.9.0|Apache 2.0|
2020
|colorama|0.4.6|BSD|
21-
|coverage|7.2.2|Apache 2.0|
22-
|dapr|1.8.3|Apache 2.0|
23-
|Deprecated|1.2.13|MIT|
21+
|coverage|7.3.0|Apache 2.0|
22+
|dapr|1.10.0|Apache 2.0|
23+
|Deprecated|1.2.14|MIT|
2424
|deprecation|2.1.0|Apache 2.0|
25-
|distlib|0.3.6|Python Software Foundation License|
26-
|exceptiongroup|1.1.1|MIT|
27-
|filelock|3.10.7|The Unlicense (Unlicense)|
28-
|flake8|6.0.0|MIT|
29-
|flake8-bugbear|23.3.23|MIT|
30-
|frozenlist|1.3.3|Apache 2.0|
25+
|distlib|0.3.7|Python Software Foundation License|
26+
|exceptiongroup|1.1.3|MIT|
27+
|filelock|3.12.2|The Unlicense (Unlicense)|
28+
|flake8|6.1.0|MIT|
29+
|flake8-bugbear|23.7.10|MIT|
30+
|frozenlist|1.4.0|Apache 2.0|
3131
|gitdb|4.0.10|BSD|
32-
|GitPython|3.1.31|BSD|
33-
|grpc-stubs|1.24.12.1|MIT|
34-
|grpcio|1.48.2|Apache 2.0|
35-
|grpcio-tools|1.48.2|Apache 2.0|
36-
|identify|2.5.22|MIT|
32+
|GitPython|3.1.32|BSD|
33+
|grpc-stubs|1.53.0.2|MIT|
34+
|grpcio|1.57.0|Apache 2.0|
35+
|grpcio-tools|1.57.0|Apache 2.0|
36+
|identify|2.5.27|MIT|
3737
|idna|3.4|BSD|
3838
|iniconfig|2.0.0|MIT|
3939
|isort|5.12.0|MIT|
40-
|markdown-it-py|2.2.0|MIT|
40+
|markdown-it-py|3.0.0|MIT|
4141
|mccabe|0.7.0|MIT|
4242
|mdurl|0.1.2|MIT|
43-
|multidict|6.0.3|Apache 2.0|
44-
|mypy|1.1.1|MIT|
43+
|multidict|6.0.4|Apache 2.0|
44+
|mypy|1.5.1|MIT|
4545
|mypy-extensions|1.0.0|MIT|
46-
|mypy-protobuf|3.3.0|Apache 2.0|
47-
|nodeenv|1.7.0|BSD|
48-
|opentelemetry-api|1.14.0|Apache 2.0|
49-
|opentelemetry-distro|0.35b0|Apache 2.0|
50-
|opentelemetry-instrumentation|0.35b0|Apache 2.0|
51-
|opentelemetry-instrumentation-logging|0.35b0|Apache 2.0|
52-
|opentelemetry-sdk|1.14.0|Apache 2.0|
53-
|opentelemetry-semantic-conventions|0.35b0|Apache 2.0|
54-
|packaging|23.0|Apache 2.0<br/>BSD|
46+
|mypy-protobuf|3.4.0|Apache 2.0|
47+
|nodeenv|1.8.0|BSD|
48+
|opentelemetry-api|1.15.0|Apache 2.0|
49+
|opentelemetry-distro|0.36b0|Apache 2.0|
50+
|opentelemetry-instrumentation|0.36b0|Apache 2.0|
51+
|opentelemetry-instrumentation-logging|0.36b0|Apache 2.0|
52+
|opentelemetry-sdk|1.15.0|Apache 2.0|
53+
|opentelemetry-semantic-conventions|0.36b0|Apache 2.0|
54+
|packaging|23.1|Apache 2.0<br/>BSD|
5555
|paho-mqtt|1.6.1|OSI Approved|
56-
|pathspec|0.11.1|Mozilla Public License 2.0 (MPL 2.0)|
56+
|pathspec|0.11.2|Mozilla Public License 2.0 (MPL 2.0)|
5757
|pbr|5.11.1|Apache 2.0|
5858
|pip|23.2.1|MIT|
59-
|pip-tools|6.12.3|BSD|
60-
|platformdirs|3.2.0|MIT|
61-
|pluggy|1.0.0|MIT|
62-
|pre-commit|3.2.2|MIT|
63-
|protobuf|3.20.3|Google License|
64-
|pycodestyle|2.10.0|MIT|
59+
|pip-tools|7.3.0|BSD|
60+
|platformdirs|3.10.0|MIT|
61+
|pluggy|1.3.0|MIT|
62+
|pre-commit|3.3.3|MIT|
63+
|protobuf|4.21.12|Google License|
64+
|pycodestyle|2.11.0|MIT|
6565
|pydocstyle|6.3.0|MIT|
66-
|pyflakes|3.0.1|MIT|
67-
|Pygments|2.14.0|Simplified BSD|
68-
|pyproject-api|1.5.1|MIT|
66+
|pyflakes|3.1.0|MIT|
67+
|Pygments|2.16.1|Simplified BSD|
68+
|pyproject-api|1.5.4|MIT|
6969
|pyproject-hooks|1.0.0|MIT|
70-
|pytest|7.2.2|MIT|
71-
|pytest-asyncio|0.21.0|Apache 2.0|
72-
|pytest-cov|4.0.0|MIT|
70+
|pytest|7.4.0|MIT|
71+
|pytest-asyncio|0.21.1|Apache 2.0|
72+
|pytest-cov|4.1.0|MIT|
7373
|python-dateutil|2.8.2|Apache 2.0<br/>BSD|
7474
|pytz|2023.3|MIT|
75-
|pytz-deprecation-shim|0.1.0.post0|Apache 2.0|
76-
|PyYAML|6.0|MIT|
77-
|rich|13.3.3|MIT|
75+
|PyYAML|6.0.1|MIT|
76+
|rich|13.5.2|MIT|
7877
|setuptools|58.1.0|MIT|
7978
|six|1.16.0|MIT|
8079
|smmap|5.0.0|BSD|
8180
|snowballstemmer|2.2.0|New BSD|
82-
|stevedore|5.0.0|Apache 2.0|
81+
|stevedore|5.1.0|Apache 2.0|
8382
|tomli|2.0.1|MIT|
84-
|tox|4.4.11|MIT|
85-
|types-Deprecated|1.2.9.2|Apache 2.0|
86-
|types-mock|5.0.0.6|Apache 2.0|
87-
|types-protobuf|4.22.0.2|Apache 2.0|
88-
|typing-extensions|4.4.0|Python Software Foundation License|
89-
|tzdata|2023.3|Apache 2.0|
90-
|tzlocal|4.3|MIT|
91-
|virtualenv|20.21.0|MIT|
92-
|wheel|0.40.0|MIT|
93-
|wrapt|1.14.1|BSD|
94-
|yarl|1.8.2|Apache 2.0|
83+
|tox|4.10.0|MIT|
84+
|types-Deprecated|1.2.9.3|Apache 2.0|
85+
|types-mock|5.1.0.1|Apache 2.0|
86+
|types-protobuf|4.24.0.1|Apache 2.0|
87+
|typing-extensions|4.7.1|Python Software Foundation License|
88+
|tzlocal|5.0.1|MIT|
89+
|virtualenv|20.24.3|MIT|
90+
|wheel|0.41.2|MIT|
91+
|wrapt|1.15.0|BSD|
92+
|yarl|1.9.2|Apache 2.0|
9593
## Workflows
9694
| Dependency | Version | License |
9795
|:-----------|:-------:|--------:|

‎generate-grpc-stubs.sh

+2
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ echo "#######################################################"
1717
echo "### Generating gRPC stubs from proto files ###"
1818
echo "#######################################################"
1919

20+
set -x
21+
2022
ROOT_DIR=$( realpath "$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" )
2123

2224
python3 -m grpc_tools.protoc -I ./sdv/proto --grpc_python_out=./sdv/proto --python_out=./sdv/proto --mypy_out=./sdv/proto ./sdv/proto/**/*.proto

0 commit comments

Comments
 (0)