Merge branch 'master' into feat/openapi33

openpreserve · May 3, 2023 · 0879609 · 0879609
2 parents 1bcd811 + 993c486
commit 0879609
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 3 deletions.
diff --git a/.github/workflows/pr.yaml b/.github/workflows/pr.yaml
@@ -28,10 +28,9 @@ jobs:
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
-          pip install "setuptools<58"
           pip install pytest pytest-cov
           if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
-          npm install -g ajv-cli
+          npm install -g ajv-cli jsonlint
       - name: Static Pylint code QA
         run: pylint --errors-only **/*.py
       - name: JSON linting

diff --git a/requirements.txt b/requirements.txt
@@ -1,4 +1,3 @@
-demjson
 jsonschema
 pre-commit
 pylint