Use jsonschema >= 4.0

Author: Zac-HD

CHANGELOG.md

@@ -1,5 +1,10 @@
 # Changelog
 
+#### 0.21.0 - 2021-10-03
+- reduced filtering for object keys (#88)
+- updated to `jsonschema >= 4.0.0` (#89);
+  though support for `Draft 2019-09` and `2020-12` will take longer
+
 #### 0.20.1 - 2021-06-03
 - improved handling for fractional `multipleOf` values
 

deps/check.txt

@@ -4,23 +4,20 @@
 #
 #    pip-compile --output-file=deps/check.txt deps/check.in
 #
-appdirs==1.4.4
-    # via black
 attrs==21.2.0
     # via flake8-bugbear
 autoflake==1.4
     # via shed
 bandit==1.7.0
     # via flake8-bandit
-black==21.6b0
+black==21.9b0
     # via shed
-click==7.1.2
-    # via
-    #   black
-    #   pybetter
-    #   pyemojify
+click==8.0.1
+    # via black
 colorama==0.4.4
-    # via bandit
+    # via
+    #   bandit
+    #   click
 com2ann==0.1.1
     # via -r deps/check.in
 flake8==3.9.2
@@ -36,11 +33,11 @@ flake8==3.9.2
     #   pep8-naming
 flake8-bandit==2.1.2
     # via -r deps/check.in
-flake8-bugbear==21.4.3
+flake8-bugbear==21.9.2
     # via -r deps/check.in
 flake8-builtins==1.5.3
     # via -r deps/check.in
-flake8-comprehensions==3.5.0
+flake8-comprehensions==3.6.1
     # via -r deps/check.in
 flake8-docstrings==1.6.0
     # via -r deps/check.in
@@ -52,19 +49,18 @@ flake8-print==4.0.0
     # via -r deps/check.in
 gitdb==4.0.7
     # via gitpython
-gitpython==3.1.18
+gitpython==3.1.24
     # via bandit
-importlib-metadata==4.6.1
+importlib-metadata==4.8.1
     # via
+    #   click
     #   flake8
     #   flake8-comprehensions
     #   stevedore
-isort==5.9.2
+isort==5.9.3
+    # via shed
+libcst==0.3.21
     # via shed
-libcst==0.3.19
-    # via
-    #   pybetter
-    #   shed
 mccabe==0.6.1
     # via flake8
 mypy==0.910
@@ -74,38 +70,34 @@ mypy-extensions==0.4.3
     #   black
     #   mypy
     #   typing-inspect
-pathspec==0.8.1
+pathspec==0.9.0
     # via black
 pbr==5.6.0
     # via stevedore
-pep8-naming==0.12.0
+pep8-naming==0.12.1
     # via -r deps/check.in
-pybetter==0.3.7
-    # via shed
+platformdirs==2.4.0
+    # via black
 pycodestyle==2.7.0
     # via
     #   flake8
     #   flake8-bandit
     #   flake8-print
 pydocstyle==6.1.1
     # via flake8-docstrings
-pyemojify==0.2.0
-    # via pybetter
 pyflakes==2.3.1
     # via
     #   autoflake
     #   flake8
-pygments==2.9.0
-    # via pybetter
-pyupgrade==2.20.0
+pyupgrade==2.29.0
     # via shed
 pyyaml==5.4.1
     # via
     #   bandit
     #   libcst
-regex==2021.7.6
+regex==2021.9.30
     # via black
-shed==0.3.6
+shed==0.5.0
     # via -r deps/check.in
 six==1.16.0
     # via
@@ -115,19 +107,19 @@ smmap==4.0.0
     # via gitdb
 snowballstemmer==2.1.0
     # via pydocstyle
-stevedore==3.3.0
+stevedore==3.4.0
     # via bandit
 tokenize-rt==4.1.0
     # via pyupgrade
 toml==0.10.2
-    # via
-    #   black
-    #   mypy
+    # via mypy
+tomli==1.2.1
+    # via black
 typed-ast==1.4.3
     # via
     #   black
     #   mypy
-typing-extensions==3.10.0.0
+typing-extensions==3.10.0.2
     # via
     #   black
     #   gitpython
@@ -137,5 +129,5 @@ typing-extensions==3.10.0.0
     #   typing-inspect
 typing-inspect==0.7.1
     # via libcst
-zipp==3.5.0
+zipp==3.6.0
     # via importlib-metadata

deps/test.txt

@@ -4,39 +4,47 @@
 #
 #    pip-compile --output-file=deps/test.txt deps/test.in setup.py
 #
+arrow==1.2.0
+    # via isoduration
 atomicwrites==1.4.0
     # via pytest
 attrs==21.2.0
     # via
     #   hypothesis
     #   jsonschema
     #   pytest
+cached-property==1.5.2
+    # via fqdn
 colorama==0.4.4
     # via pytest
-coverage==5.5
+coverage==6.0
     # via pytest-cov
 execnet==1.9.0
     # via pytest-xdist
-hypothesis==6.14.1
+fqdn==1.5.1
+    # via jsonschema
+hypothesis==6.23.1
     # via hypothesis-jsonschema (setup.py)
 idna==3.2
     # via jsonschema
-importlib-metadata==4.6.1
+importlib-metadata==4.8.1
     # via
     #   jsonschema
     #   pluggy
     #   pytest
 iniconfig==1.1.1
     # via pytest
+isoduration==20.11.0
+    # via jsonschema
 jsonpointer==2.1
     # via jsonschema
-jsonschema[format]==3.2.0
+jsonschema[format]==4.0.1
     # via
     #   -r deps/test.in
     #   hypothesis-jsonschema (setup.py)
 packaging==21.0
     # via pytest
-pluggy==0.13.1
+pluggy==1.0.0
     # via pytest
 py==1.10.0
     # via
@@ -46,7 +54,7 @@ pyparsing==2.4.7
     # via packaging
 pyrsistent==0.18.0
     # via jsonschema
-pytest==6.2.4
+pytest==6.2.5
     # via
     #   -r deps/test.in
     #   pytest-cov
@@ -56,26 +64,31 @@ pytest-cov==2.12.1
     # via -r deps/test.in
 pytest-forked==1.3.0
     # via pytest-xdist
-pytest-xdist==2.3.0
+pytest-xdist==2.4.0
     # via -r deps/test.in
+python-dateutil==2.8.2
+    # via arrow
+rfc3339-validator==0.1.4
+    # via jsonschema
 rfc3987==1.3.8
     # via jsonschema
 six==1.16.0
-    # via jsonschema
+    # via
+    #   python-dateutil
+    #   rfc3339-validator
 sortedcontainers==2.4.0
     # via hypothesis
-strict-rfc3339==0.7
-    # via jsonschema
 toml==0.10.2
     # via
     #   pytest
     #   pytest-cov
-typing-extensions==3.10.0.0
-    # via importlib-metadata
+typing-extensions==3.10.0.2
+    # via
+    #   arrow
+    #   importlib-metadata
+uri-template==1.1.0
+    # via jsonschema
 webcolors==1.11.1
     # via jsonschema
-zipp==3.5.0
+zipp==3.6.0
     # via importlib-metadata
-
-# The following packages are considered to be unsafe in a requirements file:
-# setuptools

setup.py

@@ -21,7 +21,7 @@ def local_file(name: str) -> str:
     name="hypothesis-jsonschema",
     version=__version__,
     author="Zac Hatfield-Dodds",
-    author_email="zac@hypothesis.works",
+    author_email="zac@zhd.dev",
     packages=setuptools.find_packages(SOURCE),
     package_dir={"": SOURCE},
     package_data={"": ["py.typed"]},
@@ -30,7 +30,7 @@ def local_file(name: str) -> str:
     license="MPL 2.0",
     description="Generate test data from JSON schemata with Hypothesis",
     zip_safe=False,
-    install_requires=["hypothesis>=5.3.0", "jsonschema>=3.0.2"],
+    install_requires=["hypothesis>=5.3.0", "jsonschema>=4.0.0"],
     python_requires=">=3.6",
     classifiers=[
         "Development Status :: 4 - Beta",
@@ -42,6 +42,7 @@ def local_file(name: str) -> str:
         "Programming Language :: Python :: 3.6",
         "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
         "Topic :: Education :: Testing",
         "Topic :: Software Development :: Testing",
         "Typing :: Typed",

src/hypothesis_jsonschema/__init__.py

@@ -3,7 +3,7 @@
 The only public API is `from_schema`; check the docstring for details.
 """
 
-__version__ = "0.20.1"
+__version__ = "0.21.0"
 __all__ = ["from_schema"]
 
 from ._from_schema import from_schema

src/hypothesis_jsonschema/_canonicalise.py

@@ -12,6 +12,7 @@
 most things by construction instead of by filtering.  That's the difference
 between "I'd like it to be faster" and "doesn't finish at all".
 """
+import contextlib
 import itertools
 import json
 import math
@@ -69,13 +70,15 @@ def next_down(val: float) -> float:
 
 
 def _get_validator_class(schema: Schema) -> JSONSchemaValidator:
-    try:
+    with contextlib.suppress(jsonschema.exceptions.SchemaError):
         validator = jsonschema.validators.validator_for(schema)
         validator.check_schema(schema)
-    except jsonschema.exceptions.SchemaError:
-        validator = jsonschema.Draft4Validator
-        validator.check_schema(schema)
-    return validator
+        return validator
+    with contextlib.suppress(jsonschema.exceptions.SchemaError):
+        jsonschema.Draft7Validator.check_schema(schema)
+        return jsonschema.Draft7Validator
+    jsonschema.Draft4Validator.check_schema(schema)
+    return jsonschema.Draft4Validator
 
 
 def make_validator(schema: Schema) -> JSONSchemaValidator:

tests/test_canonicalise.py

@@ -38,19 +38,12 @@ def test_canonicalises_to_equivalent_fixpoint(schema_strategy, data):
         assume(False)
     instance = data.draw(JSON_STRATEGY | strat, label="instance")
     assert is_valid(instance, schema) == is_valid(instance, cc)
-    jsonschema.validators.validator_for(schema).check_schema(schema)
+    make_validator(schema)
 
 
 @pytest.mark.parametrize(
     "schema, examples",
-    [
-        # See https://github.com/Julian/jsonschema/pull/746
-        pytest.param(
-            {"type": "integer", "multipleOf": 0.75},
-            [1.5e308],
-            marks=pytest.mark.xfail(raises=OverflowError),
-        ),
-    ],
+    [({"type": "integer", "multipleOf": 0.75}, [1.5e308])],
 )
 def test_canonicalises_to_equivalent_fixpoint_examples(schema, examples):
     """Check that an object drawn from an arbitrary schema is valid.