diff --git a/.github/workflows/deploy_site.yaml b/.github/workflows/deploy_site.yaml index 2bcdc9c3c..0538a40c8 100644 --- a/.github/workflows/deploy_site.yaml +++ b/.github/workflows/deploy_site.yaml @@ -13,12 +13,12 @@ jobs: - name: Checkout git uses: actions/checkout@v3 - name: Setup Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v3 with: python-version: 3.9 architecture: x64 - name: Install Python dependencies - uses: py-actions/py-dependency-install@v2 + uses: py-actions/py-dependency-install@v4 with: path: "scripts/requirements.txt" - name: Prepare build diff --git a/.github/workflows/frictionless.yaml b/.github/workflows/frictionless.yaml index 67370d31e..d1b44cb02 100644 --- a/.github/workflows/frictionless.yaml +++ b/.github/workflows/frictionless.yaml @@ -13,6 +13,8 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout repository - uses: actions/checkout@v2 + uses: actions/checkout@v3 - name: Validate data - uses: frictionlessdata/repository@v1 + uses: frictionlessdata/repository@v2 + with: + inquiry: data/data-validation.yaml diff --git a/.github/workflows/update_data.yml b/.github/workflows/update_data.yml index ae1e70bd7..c167fa165 100644 --- a/.github/workflows/update_data.yml +++ b/.github/workflows/update_data.yml @@ -20,12 +20,12 @@ jobs: with: ref: main # branch - name: Setup Python - uses: actions/setup-python@v2 + uses: actions/setup-python@v3 with: python-version: 3.8 architecture: x64 - name: Install Python dependencies - uses: py-actions/py-dependency-install@v2 + uses: py-actions/py-dependency-install@v4 with: path: "scripts/requirements.txt" - name: Update ${{ matrix.source }}.csv file @@ -33,7 +33,7 @@ jobs: - name: re-sync with git repo run: git pull - name: commit & push with rebase - uses: augusto-herrmann/rebase-commit-push@1.1.1 + uses: benkaiser/rebase-commit-push@1.3 with: branch: main author_email: 41898282+github-actions[bot]@users.noreply.github.com diff --git a/data/data-validation.yaml b/data/data-validation.yaml new file mode 100644 index 000000000..05bf92169 --- /dev/null +++ b/data/data-validation.yaml @@ -0,0 +1,2 @@ +tasks: + - path: data/datapackage.json diff --git a/datapackage.json b/data/datapackage.json similarity index 100% rename from datapackage.json rename to data/datapackage.json diff --git a/public-body-schema.json b/data/public-body-schema.json similarity index 100% rename from public-body-schema.json rename to data/public-body-schema.json diff --git a/scripts/requirements.txt b/scripts/requirements.txt index 9c5be42cc..8b48c5557 100644 --- a/scripts/requirements.txt +++ b/scripts/requirements.txt @@ -1,4 +1,4 @@ python-slugify[unidecode]==6.1.1 requests==2.31.0 pandas==1.4.1 -frictionless==4.28.1 +frictionless==5.13.1