Merge pull request #476 from COVESA/release/6.0

VSS 6.0 merge-back

Author: erikbosch

.bumpversion.toml

@@ -1,5 +1,5 @@
 [tool.bumpversion]
-current_version = "6.0.0-dev0"
+current_version = "6.0.0"
 parse = """(?x)
     (?P<major>0|[1-9]\\d*)\\.
     (?P<minor>0|[1-9]\\d*)\\.

.gitignore

@@ -94,3 +94,6 @@ ENV/
 # Test output files
 *_output.graphql
 test_output.graphql
+
+# Test file for ROS tests, generated by test_generic.py
+ros_test_topics.txt

CHANGELOG.md

@@ -8,7 +8,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 > [!IMPORTANT]
 > This document only contain changes introduced in VSS-Tools 3.0 or later
 
-## Unreleased (major)
+## 6.0
 
 ### Changed
 
@@ -20,10 +20,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 
 - `plantuml` exporter
+- `ROS 2 Interface` exporter
+- `s2dm` exporter
 
 ### Removed
 
- - vspec2ttl removed.
+ - vspec2ttl removed
+- `graphql` exporter
 
 ## 5.0
 

README.md

@@ -66,11 +66,12 @@ Other exporters may have stricter requirements.
 | VSS-tools version | Supported VSS catalog versions | Comments |
 | ----------------- | ------------------------------ | -------- |
 | `v3.0`            | `v3.0` - `v3.1.1`              |
-| `v3.1`            | `v3.0` -`v4.0`                 |
+| `v3.1`            | `v3.0` - `v4.0`                |
 | `v4.0`            | `v4.0`                         |
 | `v4.1`            | `v4.0` -                       |
 | `4.2`             | `v4.0` -                       |
 | `5.0`             | `v5.0` -                       |
+| `6.0`             | `v5.0` -                       |
 | `<latest source>` | `v5.0` -                       |
 
 ### Changes affecting compatibility

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "vss-tools"
-version = "6.0.0-dev0"
+version = "6.0.0"
 description='COVESA Vehicle Signal Specification tooling.'
 readme = "README.md"
 requires-python = ">=3.10"
@@ -49,7 +49,7 @@ select = ["E", "F", "I"]
 
 [dependency-groups]
 dev = [
-    "bump-my-version>=1.2.0",
+    "bump-my-version>=1.2.5",
     "mypy>=1.13.0",
     "nox>=2024.10.9",
     "pre-commit>=4.0.1",
@@ -60,3 +60,6 @@ dev = [
     "types-pyyaml>=6.0.12.20240917",
     "types-setuptools>=75.3.0.20241107",
 ]
+
+[tool.coverage.run]
+patch = ["subprocess"]

tests/test_graphql_utils.py

@@ -323,7 +323,8 @@ def test_extract_custom_directives_empty_schema(self):
         custom_directives = extract_custom_directives_from_schema(schema)
 
         # Should be empty since no custom directives defined
-        assert len(custom_directives) == 0
+        # But is 1 from graphql-core 3.2.7 onwards due to "oneOf"
+        assert len(custom_directives) == 1
 
     def test_load_predefined_schema_elements(self):
         """Test loading predefined schema elements (combined function)."""

tests/vspec/test_comment/topics.txt

@@ -40,8 +40,6 @@ def run_exporter(directory, exporter, tmp_path):
     types = directory / "types.vspec"
     output = tmp_path / f"out.{exporter}"
     expected = directory / f"expected.{exporter}"
-    topics_file = directory / "topics.txt"
-    topics_file.write_text("# includes only branch A \n" "A.*", encoding="utf-8")
     if not expected.exists():
         # If you want find directory/exporter combinations not yet covered enable the assert
         # assert False, f"Folder {expected} not found"
@@ -54,6 +52,10 @@ def run_exporter(directory, exporter, tmp_path):
     elif exporter in ["samm"]:
         cmd += f" --target-folder {output}"
     elif exporter in ["ros2interface"]:
+        # Generate a topics file for test, shall not be checked in
+        topics_file = directory / "ros_test_topics.txt"
+        topics_file.write_text("# includes only branch A\n" "A.*", encoding="utf-8")
+
         cmd += f" --output {output}"
         cmd += f" --topics-file {topics_file} --topics A.* --topics A.Double --topics fqn:A.Uint8"
         cmd += "  --mode aggregate --srv both --expand --srv-use-msg --exclude-topics Z.*"