diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index cf419ca..5a17b96 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -9,7 +9,6 @@ on: branches: - master - release-v* - workflow_dispatch: jobs: tests: diff --git a/.gitignore b/.gitignore index 58df55a..6432a4b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ .vscode +.pytest_cache build _build -**.pyc \ No newline at end of file +**.pyc diff --git a/.readthedocs.yml b/.readthedocs.yml index 0267561..b6dab1c 100644 --- a/.readthedocs.yml +++ b/.readthedocs.yml @@ -2,10 +2,14 @@ # See https://docs.readthedocs.io/en/stable/config-file/v2.html for details version: 2 +build: + os: ubuntu-20.04 + tools: + python: "3.9" + sphinx: - configuration: docs/conf.py + configuration: docs/source/conf.py python: - version: 3.9 install: - requirements: docs/requirements.txt \ No newline at end of file diff --git a/tests/requirements.txt b/tests/requirements.txt index 44349e4..34677d2 100644 --- a/tests/requirements.txt +++ b/tests/requirements.txt @@ -1,2 +1,2 @@ -jschon<1 -pytest<7 \ No newline at end of file +jschon~=0.7.0 +pytest~=6.0 \ No newline at end of file diff --git a/tests/test_schema.py b/tests/test_schema.py index f794807..2e12767 100644 --- a/tests/test_schema.py +++ b/tests/test_schema.py @@ -1,11 +1,10 @@ import json -from jschon.catalogue import jsonschema_2019_09 -from jschon.jsonschema import JSONSchema +from jschon import create_catalog, JSONSchema def test_that_the_schema_follows_the_metaschema(): - jsonschema_2019_09.initialize() + catalog_2019_09 = create_catalog("2019-09", default=True) with open("schema.json") as file: raw = json.load(file) - schema = JSONSchema(raw) + schema = JSONSchema(raw, catalog=catalog_2019_09) schema.validate()