From 67a99adc0e74c41e7a909af75845c650a4bc3ad5 Mon Sep 17 00:00:00 2001 From: Gerry Campion Date: Fri, 10 Jul 2026 11:16:50 -0400 Subject: [PATCH] more ruamel fixes --- .github/workflows/update-published-results.yml | 2 +- .github/workflows/validate-yaml-format.yml | 9 ++++----- .pre-commit-config.yaml | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/.github/workflows/update-published-results.yml b/.github/workflows/update-published-results.yml index 498dd9342..ba0c5e14b 100644 --- a/.github/workflows/update-published-results.yml +++ b/.github/workflows/update-published-results.yml @@ -76,7 +76,7 @@ jobs: ../venv/bin/pip install . --group dev - name: Install script dependencies - run: venv/bin/pip install tabulate jmespath pyyaml + run: venv/bin/pip install tabulate jmespath pyyaml ruamel.yaml # ----------------------------------------------------------------------- # 4. Run the engine for every Published rule, writing actual results.csv diff --git a/.github/workflows/validate-yaml-format.yml b/.github/workflows/validate-yaml-format.yml index 7a7693d17..8afa3825b 100644 --- a/.github/workflows/validate-yaml-format.yml +++ b/.github/workflows/validate-yaml-format.yml @@ -2,8 +2,8 @@ name: Validate YAML Formatting on: pull_request: paths: - - 'Unpublished/**/rule.yml' - - 'Published/**/rule.yml' + - "Unpublished/**/rule.yml" + - "Published/**/rule.yml" types: [opened, synchronize, reopened] workflow_dispatch: {} jobs: @@ -20,9 +20,8 @@ jobs: - name: Set up Python 3.12 uses: actions/setup-python@v5 with: - python-version: '3.12' - - name: Install pyyaml - run: pip install pyyaml + python-version: "3.12" + - run: pip install ruamel.yaml - name: Detect changed rule.yml files id: changed-files run: | diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ef3757b1d..070e5ec2e 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -7,5 +7,5 @@ repos: entry: python scripts/sort_yaml.py --check types: [yaml] files: ".*/rule\\.yml$" - additional_dependencies: [pyyaml] + additional_dependencies: [ruamel.yaml] pass_filenames: true