Adapt examples (#65)

dennismeister93 · web-flow · commit 84eb619326cc · 2023-03-28T13:04:20.000+02:00
* Fix versions and scripts

---------

Signed-off-by: Dennis Meister &lt;dennis.meister@bosch.com&gt;
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -30,7 +30,7 @@ jobs:
       - name: Initialize python
         uses: actions/setup-python@v4
         with:
-            python-version: 3.9
+            python-version: 3.10
 
       - name: Install Dependencies
         run: |
diff --git a/.vscode/scripts/run-vehicledatabroker-cli.sh b/.vscode/scripts/run-vehicledatabroker-cli.sh
@@ -14,35 +14,36 @@
 # SPDX-License-Identifier: Apache-2.0
 
 echo "#######################################################"
-echo "### Running VehicleDataBroke CLI                    ###"
+echo "### Running VehicleDataBroker CLI                   ###"
 echo "#######################################################"
 
 ROOT_DIRECTORY=$( realpath "$( cd -- "$(dirname "$0")" >/dev/null 2>&1 ; pwd -P )/../.." )
+SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 source $ROOT_DIRECTORY/.vscode/scripts/exec-check.sh "$@" $(basename $BASH_SOURCE .sh)
 DATABROKER_VERSION=$(cat $ROOT_DIRECTORY/prerequisite_settings.json | jq .databroker.version | tr -d '"')
 
 sudo chown $(whoami) $HOME
-DATABROKER_ASSET_FOLDER="$ROOT_DIRECTORY/.vscode/scripts/assets/databroker/$DATABROKER_VERSION"
-DOWNLOAD_URL=https://github.com/boschglobal/kuksa.val/releases/download
-
+# Needed because of how the databroker release is tagged
+DATABROKER_ASSET_FOLDER="$SCRIPT_DIR/assets/databroker/$DATABROKER_VERSION"
 #Detect host environment (distinguish for Mac M1 processor)
 if [[ `uname -m` == 'aarch64' || `uname -m` == 'arm64' ]]; then
     echo "Detected ARM architecture"
     PROCESSOR="aarch64"
-    DATABROKER_BINARY_NAME="databroker_aarch64.tar.gz"
-    DATABROKER_EXEC_PATH="$DATABROKER_ASSET_FOLDER/$PROCESSOR/target/aarch64-unknown-linux-gnu/release"
+    DATABROKER_BINARY_NAME="databroker-cli-arm64.tar.gz"
 else
     echo "Detected x86_64 architecture"
     PROCESSOR="x86_64"
-    DATABROKER_BINARY_NAME='databroker_x86_64.tar.gz'
-    DATABROKER_EXEC_PATH="$DATABROKER_ASSET_FOLDER/$PROCESSOR/target/release"
+    DATABROKER_BINARY_NAME='databroker-cli-amd64.tar.gz'
 fi
 
-if [[ ! -f "$DATABROKER_EXEC_PATH/databroker" ]]
+DATABROKER_EXEC_PATH="$DATABROKER_ASSET_FOLDER/$PROCESSOR/databroker-cli"
+
+if [[ ! -f "$DATABROKER_EXEC_PATH/databroker-cli" ]]
 then
-  echo "Downloading databroker:$DATABROKER_VERSION"
-  curl -o $DATABROKER_ASSET_FOLDER/$PROCESSOR/$DATABROKER_BINARY_NAME --create-dirs -L -H "Accept: application/octet-stream" "$DOWNLOAD_URL/$DATABROKER_VERSION/$DATABROKER_BINARY_NAME"
-  tar -xf $DATABROKER_ASSET_FOLDER/$PROCESSOR/$DATABROKER_BINARY_NAME -C $DATABROKER_ASSET_FOLDER/$PROCESSOR
+    DOWNLOAD_URL=https://github.com/eclipse/kuksa.val/releases/download
+    echo "Downloading databroker:$DATABROKER_VERSION"
+    curl -o $DATABROKER_ASSET_FOLDER/$PROCESSOR/$DATABROKER_BINARY_NAME --create-dirs -L -H "Accept: application/octet-stream" "$DOWNLOAD_URL/$DATABROKER_VERSION/$DATABROKER_BINARY_NAME"
+    tar -xf $DATABROKER_ASSET_FOLDER/$PROCESSOR/$DATABROKER_BINARY_NAME -C $DATABROKER_ASSET_FOLDER/$PROCESSOR
 fi
 
 $DATABROKER_EXEC_PATH/databroker-cli
diff --git a/README.md b/README.md
@@ -24,7 +24,7 @@ This includes the following packages:
 
 ## Prerequisites
 
-- Python 3.9 or later is required to use this package.
+- Python 3.10 or later is required to use this package.
 
 ## Install the package
 
diff --git a/examples/array-datatype/AppManifest.json b/examples/array-datatype/AppManifest.json
@@ -25,14 +25,14 @@
                 }
             ],
             "python": {
-                "version": "3.9"
+                "version": "3.10"
             },
             "dapr": {
                 "cli": {
-                    "version": "1.9.1"
+                    "version": "1.10.0"
                 },
                 "runtime": {
-                    "version": "1.8.1"
+                    "version": "1.10.2"
                 }
             }
         }
diff --git a/examples/atomic-set/AppManifest.json b/examples/atomic-set/AppManifest.json
@@ -32,14 +32,14 @@
                 }
             ],
             "python": {
-                "version": "3.9"
+                "version": "3.10"
             },
             "dapr": {
                 "cli": {
-                    "version": "1.9.1"
+                    "version": "1.10.0"
                 },
                 "runtime": {
-                    "version": "1.8.1"
+                    "version": "1.10.2"
                 }
             }
         }
diff --git a/examples/datapoint-set/AppManifest.json b/examples/datapoint-set/AppManifest.json
@@ -33,14 +33,14 @@
                 }
             ],
             "python": {
-                "version": "3.9"
+                "version": "3.10"
             },
             "dapr": {
                 "cli": {
-                    "version": "1.9.1"
+                    "version": "1.10.0"
                 },
                 "runtime": {
-                    "version": "1.8.1"
+                    "version": "1.10.2"
                 }
             }
         }
diff --git a/examples/dog-mode/AppManifest.json b/examples/dog-mode/AppManifest.json
@@ -32,14 +32,14 @@
                 }
             ],
             "python": {
-                "version": "3.9"
+                "version": "3.10"
             },
             "dapr": {
                 "cli": {
-                    "version": "1.9.1"
+                    "version": "1.10.0"
                 },
                 "runtime": {
-                    "version": "1.8.1"
+                    "version": "1.10.2"
                 }
             }
         }
diff --git a/examples/dynamic-rule/AppManifest.json b/examples/dynamic-rule/AppManifest.json
@@ -25,14 +25,14 @@
                 }
             ],
             "python": {
-                "version": "3.9"
+                "version": "3.10"
             },
             "dapr": {
                 "cli": {
-                    "version": "1.9.1"
+                    "version": "1.10.0"
                 },
                 "runtime": {
-                    "version": "1.8.1"
+                    "version": "1.10.2"
                 }
             }
         }
diff --git a/examples/seat-adjuster/AppManifest.json b/examples/seat-adjuster/AppManifest.json
@@ -33,14 +33,14 @@
                 }
             ],
             "python": {
-                "version": "3.9"
+                "version": "3.10"
             },
             "dapr": {
                 "cli": {
-                    "version": "1.9.1"
+                    "version": "1.10.0"
                 },
                 "runtime": {
-                    "version": "1.8.1"
+                    "version": "1.10.2"
                 }
             }
         }
diff --git a/examples/seat-adjuster/requirements-links.txt b/examples/seat-adjuster/requirements-links.txt
@@ -1,2 +1,2 @@
-git+https://github.com/eclipse-velocitas/vehicle-app-python-sdk.git@v0.8.0
+git+https://github.com/eclipse-velocitas/vehicle-app-python-sdk.git@v0.8.2
 git+https://github.com/eclipse-velocitas/vehicle-model-python.git@v0.3.0
diff --git a/examples/seat-adjuster/requirements.txt b/examples/seat-adjuster/requirements.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.9
+# This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
 #    pip-compile
diff --git a/examples/seat-adjuster/tests/requirements.txt b/examples/seat-adjuster/tests/requirements.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.9
+# This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
 #    pip-compile
diff --git a/examples/static-rule/AppManifest.json b/examples/static-rule/AppManifest.json
@@ -25,14 +25,14 @@
                 }
             ],
             "python": {
-                "version": "3.9"
+                "version": "3.10"
             },
             "dapr": {
                 "cli": {
-                    "version": "1.7.1"
+                    "version": "1.10.0"
                 },
                 "runtime": {
-                    "version": "1.8.1"
+                    "version": "1.10.2"
                 }
             }
         }
diff --git a/examples/vdb-queries/AppManifest.json b/examples/vdb-queries/AppManifest.json
@@ -25,14 +25,14 @@
                 }
             ],
             "python": {
-                "version": "3.9"
+                "version": "3.10"
             },
             "dapr": {
                 "cli": {
-                    "version": "1.9.1"
+                    "version": "1.10.0"
                 },
                 "runtime": {
-                    "version": "1.8.1"
+                    "version": "1.10.2"
                 }
             }
         }
diff --git a/prerequisite_settings.json b/prerequisite_settings.json
@@ -15,14 +15,14 @@
         "version": "v0.1.0"
     },
     "python": {
-        "version": "3.9"
+        "version": "3.10"
     },
     "dapr": {
         "cli": {
-            "version": "1.9.1"
+            "version": "1.10.0"
         },
         "runtime": {
-            "version": "1.8.1"
+            "version": "1.10.2"
         }
     }
 }
diff --git a/requirements.txt b/requirements.txt
@@ -1,5 +1,5 @@
 #
-# This file is autogenerated by pip-compile with Python 3.9
+# This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
 #    pip-compile --extra=dev
@@ -214,7 +214,6 @@ types-protobuf==4.21.0.2
     # via mypy-protobuf
 typing-extensions==4.4.0
     # via
-    #   black
     #   mypy
     #   opentelemetry-sdk
 tzdata==2022.7
diff --git a/setup.cfg b/setup.cfg
@@ -12,7 +12,7 @@ ignore = W503, B903, E402, B905, B907, B017
 exclude =
     test_,
     sdv/dapr
-python_version = 3.9
+python_version = 3.10
 warn_unused_configs = True
 warn_redundant_casts = True
 show_error_codes = True

Original file line number	Diff line number	Diff line change
`@@ -25,14 +25,14 @@`
`25`	`25`	`}`
`26`	`26`	`],`
`27`	`27`	`"python": {`
`28`		`- "version": "3.9"`
	`28`	`+ "version": "3.10"`
`29`	`29`	`},`
`30`	`30`	`"dapr": {`
`31`	`31`	`"cli": {`
`32`		`- "version": "1.9.1"`
	`32`	`+ "version": "1.10.0"`
`33`	`33`	`},`
`34`	`34`	`"runtime": {`
`35`		`- "version": "1.8.1"`
	`35`	`+ "version": "1.10.2"`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,14 +32,14 @@`
`32`	`32`	`}`
`33`	`33`	`],`
`34`	`34`	`"python": {`
`35`		`- "version": "3.9"`
	`35`	`+ "version": "3.10"`
`36`	`36`	`},`
`37`	`37`	`"dapr": {`
`38`	`38`	`"cli": {`
`39`		`- "version": "1.9.1"`
	`39`	`+ "version": "1.10.0"`
`40`	`40`	`},`
`41`	`41`	`"runtime": {`
`42`		`- "version": "1.8.1"`
	`42`	`+ "version": "1.10.2"`
`43`	`43`	`}`
`44`	`44`	`}`
`45`	`45`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,14 +33,14 @@`
`33`	`33`	`}`
`34`	`34`	`],`
`35`	`35`	`"python": {`
`36`		`- "version": "3.9"`
	`36`	`+ "version": "3.10"`
`37`	`37`	`},`
`38`	`38`	`"dapr": {`
`39`	`39`	`"cli": {`
`40`		`- "version": "1.9.1"`
	`40`	`+ "version": "1.10.0"`
`41`	`41`	`},`
`42`	`42`	`"runtime": {`
`43`		`- "version": "1.8.1"`
	`43`	`+ "version": "1.10.2"`
`44`	`44`	`}`
`45`	`45`	`}`
`46`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`		`-git+https://github.com/eclipse-velocitas/[email protected].0`
	`1`	`+git+https://github.com/eclipse-velocitas/[email protected].2`
`2`	`2`	`git+https://github.com/eclipse-velocitas/[email protected]`