Merge pull request #26 from tomchop/dfiq1.1

DFIQ 1.1 schema changes

.github/workflows/ci.yml

@@ -1,4 +1,4 @@
-name: ci 
+name: ci
 on:
   push:
     branches:
@@ -13,12 +13,13 @@ jobs:
       - uses: actions/setup-python@v4
         with:
           python-version: 3.x
-      - run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV 
+      - run: echo "cache_id=$(date --utc '+%V')" >> $GITHUB_ENV
       - uses: actions/cache@v3
         with:
           key: mkdocs-material-${{ env.cache_id }}
           path: .cache
           restore-keys: |
             mkdocs-material-
-      - run: pip install mkdocs-material mkdocs-git-revision-date-localized-plugin mkdocs-redirects
-      - run: mkdocs gh-deploy --force -f site/mkdocs.yml
+      - run: pip install poetry
+      - run: poetry add mkdocs-material mkdocs-git-revision-date-localized-plugin mkdocs-redirects
+      - run: poetry run mkdocs gh-deploy --force -f site/mkdocs.yml

.github/workflows/yamale.yml

@@ -14,11 +14,11 @@ jobs:
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
-        pip install pipenv
-        pip install yamale
+        pip install poetry
+        poetry add yamale
     - name: Validate Scenarios YAML
       run: |
-        yamale -s utils/scenario_spec.yaml ./data/scenarios
-        yamale -s utils/facet_spec.yaml ./data/facets
-        yamale -s utils/question_spec.yaml ./data/questions
-        yamale -s utils/approach_spec.yaml ./data/approaches
+        poetry run yamale -s utils/scenario_spec.yaml ./data/scenarios
+        poetry run yamale -s utils/facet_spec.yaml ./data/facets
+        poetry run yamale -s utils/question_spec.yaml ./data/questions
+        poetry run yamale -s utils/approach_spec.yaml ./data/approaches