update requirements and conanfile (#59)

* Conan 2

* fix licenses

Author: MP91

.devcontainer/Dockerfile

@@ -12,7 +12,7 @@
 #
 # SPDX-License-Identifier: Apache-2.0
 
-FROM ghcr.io/eclipse-velocitas/devcontainer-base-images/python:v0.3
+FROM ghcr.io/eclipse-velocitas/devcontainer-base-images/python:v0.4
 
 ENV DOCKER_BUILDKIT=1
 

.github/workflows/check-licenses.yml

@@ -36,7 +36,7 @@ jobs:
         uses: actions/checkout@v4
         with:
           repository: eclipse-velocitas/license-check
-          ref: v1.2
+          ref: v1.3
           path: .github/actions/license-check
 
       - name: Run License Checker

.gitignore

@@ -137,6 +137,7 @@ gen_model/
 
 # test data repos
 tests/data/vspec
+tests/data/json
 
 # test reports
 results/

NOTICE-3RD-PARTY-CONTENT.md

@@ -14,12 +14,12 @@
 |mypy-extensions|1.1.0|unknown|
 |nodeenv|1.9.1|BSD|
 |packaging|25.0|Apache 2.0<br/>BSD|
-|platformdirs|4.3.7|MIT|
+|platformdirs|4.3.8|MIT|
 |pre-commit|4.2.0|MIT|
 |PyYAML|6.0.2|MIT|
 |tomli|2.2.1|MIT|
 |typing-extensions|4.13.2|unknown|
-|virtualenv|20.30.0|MIT|
+|virtualenv|20.31.2|MIT|
 |vss-tools|4.0|Mozilla Public License 2.0|
 ## Workflows
 | Dependency | Version | License |

src/velocitas/model_generator/cpp/cpp_generator.py

@@ -72,7 +72,9 @@ def __gen_conan_package(self):
         path = os.path.join(self.target_folder, "conanfile.py")
         with open(path, "w", encoding="utf-8") as file:
             file.write(
-                """from conans import ConanFile
+                """from conan import ConanFile
+from conan.tools.files import copy
+import os
 
 class VehicleModelConan(ConanFile):
     name = "vehicle-model"
@@ -87,7 +89,9 @@ class VehicleModelConan(ConanFile):
     requires = "vehicle-app-sdk/[>=0.1]"
 
     def package(self):
-        self.copy("*.hpp")
+        copy(self,"*.hpp",
+            src=os.path.join(self.source_folder, "include"),
+            dst=os.path.join(self.package_folder, "include"),)
 """
             )
 

tests/requirements.txt

@@ -1,4 +1,4 @@
 pytest
 pytest-cov
-conan==1.62.0
-velocitas-lib==0.0.4
+conan==2.*
+velocitas-lib==0.0.13