From 05ffef46c919c69dd87b9d28c74ee3d2fc903d0f Mon Sep 17 00:00:00 2001 From: "Pierre R. Mai" Date: Sat, 23 May 2026 18:27:20 +0000 Subject: [PATCH 1/2] Switch to newest vs, add profile Signed-off-by: Pierre R. Mai --- pyproject.toml | 5 +++-- val-profile.toml | 15 +++++++++++++++ 2 files changed, 18 insertions(+), 2 deletions(-) create mode 100644 val-profile.toml diff --git a/pyproject.toml b/pyproject.toml index 70280e7..6c59106 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -28,7 +28,7 @@ dev = [ "types-lxml>=2024.0", ] validation = [ - "osc-validation @ git+https://github.com/PMSFIT/osc-validation.git@feature/reorganize-pytest-setup", + "osc-validation @ git+https://github.com/PMSFIT/osc-validation.git@feature/improve-checker-reporting", "pytest-html>=4.2", ] @@ -75,4 +75,5 @@ features = [ ] [tool.hatch.envs.validation.scripts] -validate = "osc-validate --tool OscSimulator --toolpath $(which osc-simulator) {args}" +validate = "osc-validate --tool OscSimulator --toolpath $(which osc-simulator) --test-profile val-profile.toml {args}" +validate-all = "osc-validate --tool OscSimulator --toolpath $(which osc-simulator) {args}" diff --git a/val-profile.toml b/val-profile.toml new file mode 100644 index 0000000..c8787c2 --- /dev/null +++ b/val-profile.toml @@ -0,0 +1,15 @@ +[[xfail]] +test = "scenario/triggers/val_condition_delay.py::*" +reason = "Condition Delay Divergeance" + +[[xfail]] +test = "scenario/triggers/val_distance_*.py::*" +reason = "Unknown Condition Divergeance" + +[[xfail]] +test = "scenario/triggers/val_speed_start_trigger.py::*" +reason = "Unknown Condition Divergeance" + +[[xfail]] +test = "scenario/triggers/val_time_to_collision_start_trigger.py::*" +reason = "Unknown Condition Divergeance" From 3f8cd68860fee3d88dec3270585fcac0b3cdf359 Mon Sep 17 00:00:00 2001 From: "Pierre R. Mai" Date: Mon, 25 May 2026 17:20:11 +0200 Subject: [PATCH 2/2] Switch to hatch for validation runs Signed-off-by: Pierre R. Mai --- .github/workflows/validation.yml | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/.github/workflows/validation.yml b/.github/workflows/validation.yml index 14b424e..742adcc 100644 --- a/.github/workflows/validation.yml +++ b/.github/workflows/validation.yml @@ -18,43 +18,22 @@ jobs: steps: - name: Check out osc-simulator uses: actions/checkout@v6 - with: - path: osc-simulator - - - name: Check out osc-validation - uses: actions/checkout@v6 - with: - repository: PMSFIT/osc-validation - path: osc-validation - name: Set up Python uses: actions/setup-python@v6 with: python-version: "3.11" - - name: Install Poetry - run: pipx install "poetry>=2.0" - - - name: Install osc-simulator - working-directory: osc-simulator - run: pip install -e ".[dev]" - - - name: Install osc-validation - working-directory: osc-validation - run: poetry install --no-interaction + - name: Install Hatch + run: pipx install hatch - name: Run osc-validation suite id: run_validation - working-directory: osc-validation run: | set +e - poetry run pytest validation/scenario \ - --tool OscSimulator \ - --toolpath "$(which osc-simulator)" \ + hatch env run -e validation validate -- \ --html=validation-report.html \ - --junitxml=validation-results.xml \ - --self-contained-html \ - -v + --junitxml=validation-results.xml pytest_exit_code=$? python - <<'PY' import os @@ -96,7 +75,7 @@ jobs: if: always() uses: actions/upload-artifact@v7 with: - path: osc-validation/validation-report.html + path: validation-report.html archive: false if-no-files-found: warn