From 306254811e9e9952b9b7dc9dfbad8006ddbc403d Mon Sep 17 00:00:00 2001 From: stephane-pv Date: Thu, 9 Apr 2026 12:07:00 +0200 Subject: [PATCH 1/2] - Moved schemas to PVCollada_1.0 or PVCollada_2.0 subfolder - Adjusted validation scripts --- .../validate_xml_with_xsd_and_schematron.yml | 16 ++++++++-------- .../{ => PVCollada_1.0}/collada_schema_1_4_1.xsd | 0 .../{ => PVCollada_1.0}/pvcollada_schema_1.0.xsd | 0 .../{ => PVCollada_2.0}/collada_schema_1_5.xsd | 0 .../pvcollada_2.0_pvsyst_references_1.0.sch | 0 .../pvsyst/pvcollada_2.0_pvsyst_schema_1.0.xsd | 0 .../pvcollada_2.0_pvsyst_structure_1.0.sch | 0 .../pvcollada_business_2.0.sch | 0 .../pvcollada_references_2.0.sch | 0 .../{ => PVCollada_2.0}/pvcollada_schema_2.0.xsd | 0 .../pvcollada_structure_2.0.sch | 0 schema/{ => PVCollada_2.0}/validate.py | 0 12 files changed, 8 insertions(+), 8 deletions(-) rename schema/{ => PVCollada_1.0}/collada_schema_1_4_1.xsd (100%) rename schema/{ => PVCollada_1.0}/pvcollada_schema_1.0.xsd (100%) rename schema/{ => PVCollada_2.0}/collada_schema_1_5.xsd (100%) rename schema/{ => PVCollada_2.0}/extensions/pvsyst/pvcollada_2.0_pvsyst_references_1.0.sch (100%) rename schema/{ => PVCollada_2.0}/extensions/pvsyst/pvcollada_2.0_pvsyst_schema_1.0.xsd (100%) rename schema/{ => PVCollada_2.0}/extensions/pvsyst/pvcollada_2.0_pvsyst_structure_1.0.sch (100%) rename schema/{ => PVCollada_2.0}/pvcollada_business_2.0.sch (100%) rename schema/{ => PVCollada_2.0}/pvcollada_references_2.0.sch (100%) rename schema/{ => PVCollada_2.0}/pvcollada_schema_2.0.xsd (100%) rename schema/{ => PVCollada_2.0}/pvcollada_structure_2.0.sch (100%) rename schema/{ => PVCollada_2.0}/validate.py (100%) diff --git a/.github/workflows/validate_xml_with_xsd_and_schematron.yml b/.github/workflows/validate_xml_with_xsd_and_schematron.yml index f3b48df..78f0810 100644 --- a/.github/workflows/validate_xml_with_xsd_and_schematron.yml +++ b/.github/workflows/validate_xml_with_xsd_and_schematron.yml @@ -63,14 +63,14 @@ jobs: uses: actions/checkout@v4 with: sparse-checkout: | - schema/pvcollada_schema_2.0.xsd - schema/pvcollada_structure_2.0.sch - schema/pvcollada_references_2.0.sch - schema/pvcollada_business_2.0.sch - schema/extensions/pvsyst/pvcollada_2.0_pvsyst_schema_1.0.xsd - schema/extensions/pvsyst/pvcollada_2.0_pvsyst_structure_1.0.sch - schema/extensions/pvsyst/pvcollada_2.0_pvsyst_references_1.0.sch - schema/collada_schema_1_5.xsd + schema/PVCollada_2.0/pvcollada_schema_2.0.xsd + schema/PVCollada_2.0/pvcollada_structure_2.0.sch + schema/PVCollada_2.0/pvcollada_references_2.0.sch + schema/PVCollada_2.0/pvcollada_business_2.0.sch + schema/PVCollada_2.0/extensions/pvsyst/pvcollada_2.0_pvsyst_schema_1.0.xsd + schema/PVCollada_2.0/extensions/pvsyst/pvcollada_2.0_pvsyst_structure_1.0.sch + schema/PVCollada_2.0/extensions/pvsyst/pvcollada_2.0_pvsyst_references_1.0.sch + schema/PVCollada_2.0/collada_schema_1_5.xsd .github/workflows/validate_xml_with_xsd_and_schematron.py ${{ matrix.xml_doc }} sparse-checkout-cone-mode: false diff --git a/schema/collada_schema_1_4_1.xsd b/schema/PVCollada_1.0/collada_schema_1_4_1.xsd similarity index 100% rename from schema/collada_schema_1_4_1.xsd rename to schema/PVCollada_1.0/collada_schema_1_4_1.xsd diff --git a/schema/pvcollada_schema_1.0.xsd b/schema/PVCollada_1.0/pvcollada_schema_1.0.xsd similarity index 100% rename from schema/pvcollada_schema_1.0.xsd rename to schema/PVCollada_1.0/pvcollada_schema_1.0.xsd diff --git a/schema/collada_schema_1_5.xsd b/schema/PVCollada_2.0/collada_schema_1_5.xsd similarity index 100% rename from schema/collada_schema_1_5.xsd rename to schema/PVCollada_2.0/collada_schema_1_5.xsd diff --git a/schema/extensions/pvsyst/pvcollada_2.0_pvsyst_references_1.0.sch b/schema/PVCollada_2.0/extensions/pvsyst/pvcollada_2.0_pvsyst_references_1.0.sch similarity index 100% rename from schema/extensions/pvsyst/pvcollada_2.0_pvsyst_references_1.0.sch rename to schema/PVCollada_2.0/extensions/pvsyst/pvcollada_2.0_pvsyst_references_1.0.sch diff --git a/schema/extensions/pvsyst/pvcollada_2.0_pvsyst_schema_1.0.xsd b/schema/PVCollada_2.0/extensions/pvsyst/pvcollada_2.0_pvsyst_schema_1.0.xsd similarity index 100% rename from schema/extensions/pvsyst/pvcollada_2.0_pvsyst_schema_1.0.xsd rename to schema/PVCollada_2.0/extensions/pvsyst/pvcollada_2.0_pvsyst_schema_1.0.xsd diff --git a/schema/extensions/pvsyst/pvcollada_2.0_pvsyst_structure_1.0.sch b/schema/PVCollada_2.0/extensions/pvsyst/pvcollada_2.0_pvsyst_structure_1.0.sch similarity index 100% rename from schema/extensions/pvsyst/pvcollada_2.0_pvsyst_structure_1.0.sch rename to schema/PVCollada_2.0/extensions/pvsyst/pvcollada_2.0_pvsyst_structure_1.0.sch diff --git a/schema/pvcollada_business_2.0.sch b/schema/PVCollada_2.0/pvcollada_business_2.0.sch similarity index 100% rename from schema/pvcollada_business_2.0.sch rename to schema/PVCollada_2.0/pvcollada_business_2.0.sch diff --git a/schema/pvcollada_references_2.0.sch b/schema/PVCollada_2.0/pvcollada_references_2.0.sch similarity index 100% rename from schema/pvcollada_references_2.0.sch rename to schema/PVCollada_2.0/pvcollada_references_2.0.sch diff --git a/schema/pvcollada_schema_2.0.xsd b/schema/PVCollada_2.0/pvcollada_schema_2.0.xsd similarity index 100% rename from schema/pvcollada_schema_2.0.xsd rename to schema/PVCollada_2.0/pvcollada_schema_2.0.xsd diff --git a/schema/pvcollada_structure_2.0.sch b/schema/PVCollada_2.0/pvcollada_structure_2.0.sch similarity index 100% rename from schema/pvcollada_structure_2.0.sch rename to schema/PVCollada_2.0/pvcollada_structure_2.0.sch diff --git a/schema/validate.py b/schema/PVCollada_2.0/validate.py similarity index 100% rename from schema/validate.py rename to schema/PVCollada_2.0/validate.py From 56c2a5d241ed0c30db199f8e3fc5d5a4b9a0114e Mon Sep 17 00:00:00 2001 From: stephane-pv Date: Thu, 9 Apr 2026 12:11:11 +0200 Subject: [PATCH 2/2] Fixed validation script --- .../validate_xml_with_xsd_and_schematron.yml | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/validate_xml_with_xsd_and_schematron.yml b/.github/workflows/validate_xml_with_xsd_and_schematron.yml index 78f0810..8a714af 100644 --- a/.github/workflows/validate_xml_with_xsd_and_schematron.yml +++ b/.github/workflows/validate_xml_with_xsd_and_schematron.yml @@ -80,46 +80,46 @@ jobs: run: | python3 "$GITHUB_WORKSPACE"/.github/workflows/validate_xml_with_xsd_and_schematron.py \ "$GITHUB_WORKSPACE"/"${{ matrix.xml_doc }}" \ - --xsd pvcollada_schema_2.0.xsd + --xsd PVCollada_2.0/pvcollada_schema_2.0.xsd - name: Validate against PVCollada Structure Schematron working-directory: schema run: | python3 "$GITHUB_WORKSPACE"/.github/workflows/validate_xml_with_xsd_and_schematron.py \ "$GITHUB_WORKSPACE"/"${{ matrix.xml_doc }}" \ - --schematron pvcollada_structure_2.0.sch + --schematron PVCollada_2.0/pvcollada_structure_2.0.sch - name: Validate against PVCollada References Schematron working-directory: schema run: | python3 "$GITHUB_WORKSPACE"/.github/workflows/validate_xml_with_xsd_and_schematron.py \ "$GITHUB_WORKSPACE"/"${{ matrix.xml_doc }}" \ - --schematron pvcollada_references_2.0.sch + --schematron PVCollada_2.0/pvcollada_references_2.0.sch - name: Validate against PVCollada Business Rules Schematron working-directory: schema run: | python3 "$GITHUB_WORKSPACE"/.github/workflows/validate_xml_with_xsd_and_schematron.py \ "$GITHUB_WORKSPACE"/"${{ matrix.xml_doc }}" \ - --schematron pvcollada_business_2.0.sch + --schematron PVCollada_2.0/pvcollada_business_2.0.sch - name: Validate against PVsyst extensions XSD Schema working-directory: schema run: | python3 "$GITHUB_WORKSPACE"/.github/workflows/validate_xml_with_xsd_and_schematron.py \ "$GITHUB_WORKSPACE"/"${{ matrix.xml_doc }}" \ - --xsd extensions/pvsyst/pvcollada_2.0_pvsyst_schema_1.0.xsd + --xsd PVCollada_2.0/extensions/pvsyst/pvcollada_2.0_pvsyst_schema_1.0.xsd - name: Validate against PVCollada extensions Structure Schematron working-directory: schema run: | python3 "$GITHUB_WORKSPACE"/.github/workflows/validate_xml_with_xsd_and_schematron.py \ "$GITHUB_WORKSPACE"/"${{ matrix.xml_doc }}" \ - --schematron extensions/pvsyst/pvcollada_2.0_pvsyst_structure_1.0.sch + --schematron PVCollada_2.0/extensions/pvsyst/pvcollada_2.0_pvsyst_structure_1.0.sch - name: Validate against PVCollada extensions References Schematron working-directory: schema run: | python3 "$GITHUB_WORKSPACE"/.github/workflows/validate_xml_with_xsd_and_schematron.py \ "$GITHUB_WORKSPACE"/"${{ matrix.xml_doc }}" \ - --schematron extensions/pvsyst/pvcollada_2.0_pvsyst_references_1.0.sch + --schematron PVCollada_2.0/extensions/pvsyst/pvcollada_2.0_pvsyst_references_1.0.sch