Upgrade protobuf and grpcio (#99)

eclipse-velocitas · Aug 30, 2023 · 549820c · 549820c
1 parent 84e7cf2
commit 549820c
Show file tree

Hide file tree

Showing 15 changed files with 502 additions and 515 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -17,7 +17,8 @@
                 "SDV_MQTT_ADDRESS": "mqtt://localhost:1883",
                 "SDV_HVACSERVICE_ADDRESS": "grpc://localhost:50052",
                 "SDV_SEATSERVICE_ADDRESS": "grpc://localhost:50051",
-                "SDV_VEHICLEDATABROKER_ADDRESS": "grpc://localhost:55555"
+                "SDV_VEHICLEDATABROKER_ADDRESS": "grpc://localhost:55555",
+                "PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION": "python"
             }
         },
         {
@@ -35,7 +36,8 @@
                 "DAPR_HTTP_PORT": "3500",
                 "HVACSERVICE_DAPR_APP_ID": "hvacservice",
                 "SEATSERVICE_DAPR_APP_ID": "seatservice",
-                "VEHICLEDATABROKER_DAPR_APP_ID": "vehicledatabroker"
+                "VEHICLEDATABROKER_DAPR_APP_ID": "vehicledatabroker",
+                "PROTOCOL_BUFFERS_PYTHON_IMPLEMENTATION": "python"
             }
         }
     ],

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -77,19 +77,19 @@ In this project, the [pip-tools](https://github.com/jazzband/pip-tools) are used
 
 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:
 * 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.
-* 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.
+* 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.
 
 The process for the dependency management of this project can be summarized as following:
-* 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.
+* 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.
 
    ```bash
    pip-compile --extra=dev
    ```
-* 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.
+* 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.
    ```bash
    pip-compile --extra=dev -U
    ```
-* Run `pip-sync` or `pip install` to install the required dependencies from the [requirements.txt](./requirements.txt) alternativly.
+* Run `pip-sync` or `pip install` to install the required dependencies from the [requirements.txt](./requirements.txt) alternatively.
    ```bash
    pip-sync
    ```

diff --git a/NOTICE-3RD-PARTY-CONTENT.md b/NOTICE-3RD-PARTY-CONTENT.md
@@ -3,95 +3,93 @@
 ## Python
 | Dependency | Version | License |
 |:-----------|:-------:|--------:|
-|aiohttp|3.8.3|Apache 2.0|
+|aiohttp|3.8.5|Apache 2.0|
 |aiosignal|1.3.1|Apache 2.0|
-|APScheduler|3.10.1|MIT|
-|async-timeout|4.0.2|Apache 2.0|
-|attrs|22.1.0|MIT|
+|APScheduler|3.10.4|MIT|
+|async-timeout|4.0.3|Apache 2.0|
+|attrs|23.1.0|MIT|
 |bandit|1.7.5|Apache 2.0|
-|black|23.3.0|MIT|
+|black|23.7.0|MIT|
 |build|0.10.0|MIT|
-|cachetools|5.3.0|MIT|
-|cfgv|3.3.1|MIT|
-|chardet|5.1.0|LGPL|
-|charset-normalizer|2.1.1|MIT|
-|click|8.1.3|New BSD|
+|cachetools|5.3.1|MIT|
+|cfgv|3.4.0|MIT|
+|chardet|5.2.0|LGPL|
+|charset-normalizer|3.2.0|MIT|
+|click|8.1.7|New BSD|
 |cloudevents|1.9.0|Apache 2.0|
 |colorama|0.4.6|BSD|
-|coverage|7.2.2|Apache 2.0|
-|dapr|1.8.3|Apache 2.0|
-|Deprecated|1.2.13|MIT|
+|coverage|7.3.0|Apache 2.0|
+|dapr|1.10.0|Apache 2.0|
+|Deprecated|1.2.14|MIT|
 |deprecation|2.1.0|Apache 2.0|
-|distlib|0.3.6|Python Software Foundation License|
-|exceptiongroup|1.1.1|MIT|
-|filelock|3.10.7|The Unlicense (Unlicense)|
-|flake8|6.0.0|MIT|
-|flake8-bugbear|23.3.23|MIT|
-|frozenlist|1.3.3|Apache 2.0|
+|distlib|0.3.7|Python Software Foundation License|
+|exceptiongroup|1.1.3|MIT|
+|filelock|3.12.2|The Unlicense (Unlicense)|
+|flake8|6.1.0|MIT|
+|flake8-bugbear|23.7.10|MIT|
+|frozenlist|1.4.0|Apache 2.0|
 |gitdb|4.0.10|BSD|
-|GitPython|3.1.31|BSD|
-|grpc-stubs|1.24.12.1|MIT|
-|grpcio|1.48.2|Apache 2.0|
-|grpcio-tools|1.48.2|Apache 2.0|
-|identify|2.5.22|MIT|
+|GitPython|3.1.32|BSD|
+|grpc-stubs|1.53.0.2|MIT|
+|grpcio|1.57.0|Apache 2.0|
+|grpcio-tools|1.57.0|Apache 2.0|
+|identify|2.5.27|MIT|
 |idna|3.4|BSD|
 |iniconfig|2.0.0|MIT|
 |isort|5.12.0|MIT|
-|markdown-it-py|2.2.0|MIT|
+|markdown-it-py|3.0.0|MIT|
 |mccabe|0.7.0|MIT|
 |mdurl|0.1.2|MIT|
-|multidict|6.0.3|Apache 2.0|
-|mypy|1.1.1|MIT|
+|multidict|6.0.4|Apache 2.0|
+|mypy|1.5.1|MIT|
 |mypy-extensions|1.0.0|MIT|
-|mypy-protobuf|3.3.0|Apache 2.0|
-|nodeenv|1.7.0|BSD|
-|opentelemetry-api|1.14.0|Apache 2.0|
-|opentelemetry-distro|0.35b0|Apache 2.0|
-|opentelemetry-instrumentation|0.35b0|Apache 2.0|
-|opentelemetry-instrumentation-logging|0.35b0|Apache 2.0|
-|opentelemetry-sdk|1.14.0|Apache 2.0|
-|opentelemetry-semantic-conventions|0.35b0|Apache 2.0|
-|packaging|23.0|Apache 2.0<br/>BSD|
+|mypy-protobuf|3.4.0|Apache 2.0|
+|nodeenv|1.8.0|BSD|
+|opentelemetry-api|1.15.0|Apache 2.0|
+|opentelemetry-distro|0.36b0|Apache 2.0|
+|opentelemetry-instrumentation|0.36b0|Apache 2.0|
+|opentelemetry-instrumentation-logging|0.36b0|Apache 2.0|
+|opentelemetry-sdk|1.15.0|Apache 2.0|
+|opentelemetry-semantic-conventions|0.36b0|Apache 2.0|
+|packaging|23.1|Apache 2.0<br/>BSD|
 |paho-mqtt|1.6.1|OSI Approved|
-|pathspec|0.11.1|Mozilla Public License 2.0 (MPL 2.0)|
+|pathspec|0.11.2|Mozilla Public License 2.0 (MPL 2.0)|
 |pbr|5.11.1|Apache 2.0|
 |pip|23.2.1|MIT|
-|pip-tools|6.12.3|BSD|
-|platformdirs|3.2.0|MIT|
-|pluggy|1.0.0|MIT|
-|pre-commit|3.2.2|MIT|
-|protobuf|3.20.3|Google License|
-|pycodestyle|2.10.0|MIT|
+|pip-tools|7.3.0|BSD|
+|platformdirs|3.10.0|MIT|
+|pluggy|1.3.0|MIT|
+|pre-commit|3.3.3|MIT|
+|protobuf|4.21.12|Google License|
+|pycodestyle|2.11.0|MIT|
 |pydocstyle|6.3.0|MIT|
-|pyflakes|3.0.1|MIT|
-|Pygments|2.14.0|Simplified BSD|
-|pyproject-api|1.5.1|MIT|
+|pyflakes|3.1.0|MIT|
+|Pygments|2.16.1|Simplified BSD|
+|pyproject-api|1.5.4|MIT|
 |pyproject-hooks|1.0.0|MIT|
-|pytest|7.2.2|MIT|
-|pytest-asyncio|0.21.0|Apache 2.0|
-|pytest-cov|4.0.0|MIT|
+|pytest|7.4.0|MIT|
+|pytest-asyncio|0.21.1|Apache 2.0|
+|pytest-cov|4.1.0|MIT|
 |python-dateutil|2.8.2|Apache 2.0<br/>BSD|
 |pytz|2023.3|MIT|
-|pytz-deprecation-shim|0.1.0.post0|Apache 2.0|
-|PyYAML|6.0|MIT|
-|rich|13.3.3|MIT|
+|PyYAML|6.0.1|MIT|
+|rich|13.5.2|MIT|
 |setuptools|58.1.0|MIT|
 |six|1.16.0|MIT|
 |smmap|5.0.0|BSD|
 |snowballstemmer|2.2.0|New BSD|
-|stevedore|5.0.0|Apache 2.0|
+|stevedore|5.1.0|Apache 2.0|
 |tomli|2.0.1|MIT|
-|tox|4.4.11|MIT|
-|types-Deprecated|1.2.9.2|Apache 2.0|
-|types-mock|5.0.0.6|Apache 2.0|
-|types-protobuf|4.22.0.2|Apache 2.0|
-|typing-extensions|4.4.0|Python Software Foundation License|
-|tzdata|2023.3|Apache 2.0|
-|tzlocal|4.3|MIT|
-|virtualenv|20.21.0|MIT|
-|wheel|0.40.0|MIT|
-|wrapt|1.14.1|BSD|
-|yarl|1.8.2|Apache 2.0|
+|tox|4.10.0|MIT|
+|types-Deprecated|1.2.9.3|Apache 2.0|
+|types-mock|5.1.0.1|Apache 2.0|
+|types-protobuf|4.24.0.1|Apache 2.0|
+|typing-extensions|4.7.1|Python Software Foundation License|
+|tzlocal|5.0.1|MIT|
+|virtualenv|20.24.3|MIT|
+|wheel|0.41.2|MIT|
+|wrapt|1.15.0|BSD|
+|yarl|1.9.2|Apache 2.0|
 ## Workflows
 | Dependency | Version | License |
 |:-----------|:-------:|--------:|

diff --git a/generate-grpc-stubs.sh b/generate-grpc-stubs.sh
@@ -17,6 +17,8 @@ echo "#######################################################"
 echo "### Generating gRPC stubs from proto files          ###"
 echo "#######################################################"
 
+set -x
+
 ROOT_DIR=$( realpath "$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )" )
 
 python3 -m grpc_tools.protoc -I ./sdv/proto --grpc_python_out=./sdv/proto --python_out=./sdv/proto --mypy_out=./sdv/proto ./sdv/proto/**/*.proto