From 3855520f020aade13d268458d904dadfa4dc3f6a Mon Sep 17 00:00:00 2001 From: Remi Gau Date: Sat, 18 May 2024 10:56:50 -0400 Subject: [PATCH] drop jsonlint --- .github/workflows/validate.yml | 4 ++-- Makefile | 9 ++------- requirements.txt | 1 + 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index 4cdb8e5..0092576 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -24,7 +24,7 @@ jobs: - name: Install dependencies run: | python -m pip install --upgrade pip setuptools - pip install reproschema - npm install -g jsonlint + pip install reproschema pre-commit + pre-commit install - name: validate run: make validate \ No newline at end of file diff --git a/Makefile b/Makefile index 4388196..1713a5f 100644 --- a/Makefile +++ b/Makefile @@ -16,14 +16,9 @@ convert: download clean_artemis: rm -rf $(ARTEMIS_TSV) -validate: validate_syntax validate_schema - -# Validate jsonld -validate_syntax: - grep -r "@context" schemas | cut -d: -f1 | xargs -I {} jsonlint -q {} - # you will need to install reproschema-py to run this one ( pip install reproschema ) -validate_schema: +validate: + pre-commit run -a check-json reproschema -l DEBUG validate schemas/artemis/activities reproschema -l DEBUG validate schemas/artemis/protocols reproschema -l DEBUG validate schemas/artemis/artemis_schema.jsonld diff --git a/requirements.txt b/requirements.txt index 24f3153..8033145 100644 --- a/requirements.txt +++ b/requirements.txt @@ -9,4 +9,5 @@ rich black flake8 pre-commit +reproschema-py