Upgrade to kuksa-client 0.4.0

Using compatibility (~=0.4.0) which means that 0.4.1, 0.4.2 and so on might
be downloaded, but 0.5.0 will not be accepted

.github/workflows/kuksa_dds_feeder.yml

@@ -104,6 +104,7 @@ jobs:
     - name: Run dds tests
       run: |
         cd dds2val
-        pip3 install --no-cache-dir --pre -r requirements/requirements.txt -r requirements/requirements-kml.txt -r requirements/requirements-test.txt
+        # Note - if relying on kuksa-client pre-releases you must use --pre on the line below
+        pip3 install --no-cache-dir -r requirements/requirements.txt -r requirements/requirements-kml.txt -r requirements/requirements-test.txt
         ./ddsproviderlib/idls/generate_py_dataclass.sh
         python -m pytest tests/*

csv_provider/Dockerfile

@@ -29,7 +29,7 @@ RUN python3 -m venv /opt/venv
 ENV PATH="/opt/venv/bin:$PATH"
 
 RUN /opt/venv/bin/python3 -m pip install --upgrade pip \
-    && pip3 install --no-cache-dir --pre -r requirements.txt
+    && pip3 install --no-cache-dir -r requirements.txt
 
 
 RUN pip3 install wheel scons && pip3 install pyinstaller

csv_provider/requirements.txt

@@ -1,2 +1,2 @@
 # If pre-releases (e.g. X.YaN) are specified you must use --pre when installing
-kuksa-client >= 0.4a4
+kuksa-client ~= 0.4.0

dbc2val/README.md

@@ -67,10 +67,10 @@ $ python -V
 3. Install the needed python packages
 
 ```console
-$ pip install --pre -r requirements.txt
+$ pip install -r requirements.txt
 ```
 
-*Note - `--pre` currently needed as dbcfeeder relies on a pre-release of kuksa-client*
+*Note - Sometimes DBC Feeder on main branch rely on a kuksa-client pre-release. Then you must add `--pre` to the command above!*
 
 4. If you want to run tests and linters, you will also need to install development dependencies
 

dbc2val/requirements.in

@@ -12,18 +12,18 @@
 # and create a 'requirements.txt' file with pinned versions of all
 # dependencies:
 #
-# pip-compile requirements.in
+# pip-compile --upgrade requirements.in
 #
 # If you depend on pre-releases (of e.g. kuksa-client) use
 #
-# pip-compile --pre requirements.in
+# pip-compile --pre --upgrade requirements.in
 
 python-can ~= 4.1
 pyserial ~= 3.5
 cantools ~= 38.0
 pyyaml ~= 6.0
 can-j1939 ~= 2.0
 py_expression_eval ~= 0.3
-kuksa-client >= 0.4a4
+kuksa-client ~= 0.4.0
 types-PyYAML ~= 6.0
 types-protobuf ~= 4.21

dbc2val/requirements.txt

@@ -2,7 +2,7 @@
 # This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
-#    pip-compile --pre requirements.in
+#    pip-compile requirements.in
 #
 argparse-addons==0.12.0
     # via cantools
@@ -24,21 +24,21 @@ decorator==5.1.1
     # via jsonpath-ng
 diskcache==5.6.1
     # via cantools
-exceptiongroup==1.1.1
+exceptiongroup==1.1.2
     # via pytest
-grpcio==1.56.0rc2
+grpcio==1.56.2
     # via grpcio-tools
-grpcio-tools==1.56.0rc2
+grpcio-tools==1.56.2
     # via kuksa-client
 iniconfig==2.0.0
     # via pytest
 jsonpath-ng==1.5.3
     # via kuksa-client
-kuksa-client==0.4.0a4
+kuksa-client==0.4.0
     # via -r requirements.in
 msgpack==1.0.5
     # via python-can
-numpy==1.25.0
+numpy==1.25.1
     # via can-j1939
 packaging==23.1
     # via
@@ -48,7 +48,7 @@ pluggy==1.2.0
     # via pytest
 ply==3.11
     # via jsonpath-ng
-protobuf==4.23.3
+protobuf==4.23.4
     # via grpcio-tools
 py-expression-eval==0.3.14
     # via -r requirements.in
@@ -58,26 +58,26 @@ pyperclip==1.8.2
     # via cmd2
 pyserial==3.5
     # via -r requirements.in
-pytest==7.3.2
+pytest==7.4.0
     # via can-j1939
 python-can==4.2.2
     # via
     #   -r requirements.in
     #   can-j1939
     #   cantools
-pyyaml==6.0
+pyyaml==6.0.1
     # via -r requirements.in
 six==1.16.0
     # via jsonpath-ng
 textparser==0.24.0
     # via cantools
 tomli==2.0.1
     # via pytest
-types-protobuf==4.23.0.1
+types-protobuf==4.23.0.2
     # via -r requirements.in
-types-pyyaml==6.0.12.10
+types-pyyaml==6.0.12.11
     # via -r requirements.in
-typing-extensions==4.7.0rc1
+typing-extensions==4.7.1
     # via
     #   cantools
     #   python-can

dds2val/requirements/requirements-test.txt

@@ -4,4 +4,4 @@ pytest-html
 pytest-cov
 pytest-asyncio
 py
-kuksa-client >= 0.4a4
+kuksa-client ~= 0.4.0

dds2val/requirements/requirements.txt

@@ -1,7 +1,7 @@
 # If pre-releases (e.g. X.YaN) are specified you must use --pre when installing
 # feeder
 cyclonedds
-kuksa-client >= 0.4a4
+kuksa-client ~= 0.4.0
 # mapper
 pyyaml
 py-expression-eval

gps2val/Dockerfile

@@ -19,7 +19,8 @@ ADD . /kuksa_gps_feeder
 WORKDIR /kuksa_gps_feeder
 RUN pip install --upgrade pip
 # Note - Installing grpcio (inherited from kuksa-viss-client) takes very long time (40-60 minutes) on Alpine
-RUN pip install --pre --target /kuksa_gps_feeder --no-cache-dir -r requirements.txt
+# Note - if relying on kuksa-client pre-releases you must add --pre to the line below
+RUN pip install --target /kuksa_gps_feeder --no-cache-dir -r requirements.txt
 
 
 FROM python:3.10-alpine

gps2val/requirements.txt

@@ -1,3 +1,3 @@
 # If pre-releases (e.g. X.YaN) are specified you must use --pre when installing
-kuksa-client >= 0.4a4
+kuksa-client ~= 0.4.0
 gpsdclient

someip2val/cert/README.md

@@ -74,8 +74,8 @@ cd $(git rev-parse --show-toplevel)/someip2val/target/x86_64/release/install/bin
 - Test actuator subscriber with kuksa-client:
 
 ```bash
-# make sure pre-release client is installed
-pip3 install -U --pre kuksa-client
+# Use --pre if you rely on kuksa-client pre-releases
+pip3 install -U kuksa-client
 
 GRPC_ENABLE_FORK_SUPPORT=true kuksa-client --ip 127.0.0.1 --port 55555 --protocol grpc --insecure --token_or_tokenfile $(git rev-parse --show-toplevel)/someip2val/cert/someip2val.token
 ```