Skip to content

Commit cc2acbb

Browse files
pmaipmai
authored
Merge pull request #6 from PMSFIT/feature/automatic-checks
Add initial setup for osirules checker
2 parents ebe72ac + 688d0bf commit cc2acbb

22 files changed

+8766
-360
lines changed

‎.github/workflows/test.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ jobs:
88
runs-on: ${{ matrix.os }}
99
strategy:
1010
matrix:
11-
python-version: ["3.10", "3.11", "3.12"]
12-
os: [ubuntu-22.04, windows-2019]
11+
python-version: ["3.10", "3.11", "3.12", "3.13"]
12+
os: [ubuntu-22.04, windows-2022]
1313
name: ${{ matrix.os }} - Python ${{ matrix.python-version }}
1414
steps:
1515
- uses: actions/checkout@v4
1616
- uses: actions/setup-python@v5
1717
with:
1818
python-version: ${{ matrix.python-version }}
1919
architecture: x64
20-
- run: pip install poetry==1.8.3
20+
- run: pip install poetry==2.1.3
2121
- run: poetry install --with dev
2222
- run: poetry run pytest -vv

‎.pre-commit-config.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
repos:
22
- repo: https://github.com/pre-commit/pre-commit-hooks
3-
rev: v2.3.0
3+
rev: v5.0.0
44
hooks:
55
- id: check-yaml
66
- id: end-of-file-fixer

‎example_config/config-customrules.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<Config>
3+
4+
<Param name="InputFile" value="tests/data/deserialization_version_is_set/deserialization_version_is_set_invalid.osi" />
5+
<Param name="osiType" value="SensorView" />
6+
<Param name="osiVersion" value="3.5.0" />
7+
<Param name="osiRulesFile" value="tests/data/customrules/customrules.yml" />
8+
9+
<CheckerBundle application="osiBundle">
10+
<Param name="resultFile" value="osi_bundle_report.xqar" />
11+
<Checker checkerId="validator_osi" maxLevel="1" minLevel="3" />
12+
</CheckerBundle>
13+
14+
<ReportModule application="TextReport">
15+
<Param name="strInputFile" value="Result.xqar" />
16+
<Param name="strReportFile" value="Report.txt" />
17+
</ReportModule>
18+
19+
</Config>

‎example_config/config-missingversion.xml‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<Config>
3+
4+
<Param name="InputFile" value="tests/data/deserialization_version_is_set/deserialization_version_is_set_invalid.osi" />
5+
<Param name="osiType" value="SensorView" />
6+
<Param name="osiVersion" value="3.1.0" />
7+
8+
<CheckerBundle application="osiBundle">
9+
<Param name="resultFile" value="osi_bundle_report.xqar" />
10+
<Checker checkerId="validator_osi" maxLevel="1" minLevel="3" />
11+
</CheckerBundle>
12+
13+
<ReportModule application="TextReport">
14+
<Param name="strInputFile" value="Result.xqar" />
15+
<Param name="strReportFile" value="Report.txt" />
16+
</ReportModule>
17+
18+
</Config>

‎example_config/config-noversion.xml‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
2+
<Config>
3+
4+
<Param name="InputFile" value="tests/data/deserialization_version_is_set/deserialization_version_is_set_invalid.osi" />
5+
<Param name="osiType" value="SensorView" />
6+
7+
<CheckerBundle application="osiBundle">
8+
<Param name="resultFile" value="osi_bundle_report.xqar" />
9+
<Checker checkerId="validator_osi" maxLevel="1" minLevel="3" />
10+
</CheckerBundle>
11+
12+
<ReportModule application="TextReport">
13+
<Param name="strInputFile" value="Result.xqar" />
14+
<Param name="strReportFile" value="Report.txt" />
15+
</ReportModule>
16+
17+
</Config>

‎poetry.lock‎

Lines changed: 502 additions & 338 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎pyproject.toml‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[tool.poetry]
22
name = "qc-osi-trace"
3-
version = "0.1.0"
3+
version = "0.2.0"
44
description = "This project implements the OSI Trace Checker for the ASAM Quality Checker project."
55
authors = ["Pierre R. Mai <pmai@pmsf.de>"]
66
license = "MPL-2.0"
@@ -12,8 +12,10 @@ packages = [
1212

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

1820
[tool.poetry.group.dev.dependencies]
1921
pytest = "^8.2.2"

‎qc_ositrace/checks/__init__.py‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
11
from . import deserialization as deserialization
2+
from . import osirules as osirules

‎qc_ositrace/checks/osirules/__init__.py‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
from . import osirules_constants as osirules_constants
2+
from . import osirules_checker as osirules_checker

0 commit comments

Comments
 (0)