Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@ jobs:
runs-on: ${{ matrix.os }}
strategy:
matrix:
python-version: ["3.10", "3.11", "3.12"]
os: [ubuntu-22.04, windows-2019]
python-version: ["3.10", "3.11", "3.12", "3.13"]
os: [ubuntu-22.04, windows-2022]
name: ${{ matrix.os }} - Python ${{ matrix.python-version }}
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: ${{ matrix.python-version }}
architecture: x64
- run: pip install poetry==1.8.3
- run: pip install poetry==2.1.3
- run: poetry install --with dev
- run: poetry run pytest -vv
4 changes: 2 additions & 2 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v2.3.0
rev: v5.0.0
hooks:
- id: check-yaml
- id: end-of-file-fixer
Expand All @@ -9,6 +9,6 @@ repos:
hooks:
- id: black
name: black
entry: black
entry: poetry run black
language: system
types: [python]
19 changes: 19 additions & 0 deletions example_config/config-customrules.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<Config>

<Param name="InputFile" value="tests/data/deserialization_version_is_set/deserialization_version_is_set_invalid.osi" />
<Param name="osiType" value="SensorView" />
<Param name="osiVersion" value="3.5.0" />
<Param name="osiRulesFile" value="tests/data/customrules/customrules.yml" />

<CheckerBundle application="osiBundle">
<Param name="resultFile" value="osi_bundle_report.xqar" />
<Checker checkerId="validator_osi" maxLevel="1" minLevel="3" />
</CheckerBundle>

<ReportModule application="TextReport">
<Param name="strInputFile" value="Result.xqar" />
<Param name="strReportFile" value="Report.txt" />
</ReportModule>

</Config>
18 changes: 18 additions & 0 deletions example_config/config-missingversion.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<Config>

<Param name="InputFile" value="tests/data/deserialization_version_is_set/deserialization_version_is_set_invalid.osi" />
<Param name="osiType" value="SensorView" />
<Param name="osiVersion" value="3.1.0" />

<CheckerBundle application="osiBundle">
<Param name="resultFile" value="osi_bundle_report.xqar" />
<Checker checkerId="validator_osi" maxLevel="1" minLevel="3" />
</CheckerBundle>

<ReportModule application="TextReport">
<Param name="strInputFile" value="Result.xqar" />
<Param name="strReportFile" value="Report.txt" />
</ReportModule>

</Config>
17 changes: 17 additions & 0 deletions example_config/config-noversion.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<Config>

<Param name="InputFile" value="tests/data/deserialization_version_is_set/deserialization_version_is_set_invalid.osi" />
<Param name="osiType" value="SensorView" />

<CheckerBundle application="osiBundle">
<Param name="resultFile" value="osi_bundle_report.xqar" />
<Checker checkerId="validator_osi" maxLevel="1" minLevel="3" />
</CheckerBundle>

<ReportModule application="TextReport">
<Param name="strInputFile" value="Result.xqar" />
<Param name="strReportFile" value="Report.txt" />
</ReportModule>

</Config>
840 changes: 502 additions & 338 deletions poetry.lock

Large diffs are not rendered by default.

6 changes: 4 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
[tool.poetry]
name = "qc-osi-trace"
version = "0.1.0"
version = "0.2.0"
description = "This project implements the OSI Trace Checker for the ASAM Quality Checker project."
authors = ["Pierre R. Mai <pmai@pmsf.de>"]
license = "MPL-2.0"
Expand All @@ -12,8 +12,10 @@ packages = [

[tool.poetry.dependencies]
python = "^3.10"
asam-qc-baselib = {git = "https://github.com/asam-ev/qc-baselib-py.git", rev = "develop"}
asam-qc-baselib = {git = "https://github.com/asam-ev/qc-baselib-py.git", rev = "fix/config-param-overrides"}
open-simulation-interface = {git = "https://github.com/OpenSimulationInterface/open-simulation-interface.git", rev = "v3.7.0"}
pyyaml = "^6.0.0"
iso3166 = "^2.1.1"

[tool.poetry.group.dev.dependencies]
pytest = "^8.2.2"
Expand Down
1 change: 1 addition & 0 deletions qc_ositrace/checks/__init__.py
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
from . import deserialization as deserialization
from . import osirules as osirules
2 changes: 2 additions & 0 deletions qc_ositrace/checks/osirules/__init__.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
from . import osirules_constants as osirules_constants
from . import osirules_checker as osirules_checker
Loading