From 85d03241c123d0e3b1caa4285c607b6c5ac8a181 Mon Sep 17 00:00:00 2001 From: Oliver Bristow Date: Thu, 5 Sep 2019 14:50:55 +0100 Subject: [PATCH] Update jsonschema requirement --- ethpm/validation/manifest.py | 6 +++++- setup.py | 2 +- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/ethpm/validation/manifest.py b/ethpm/validation/manifest.py index f9306ec573..b0a0f14d5d 100644 --- a/ethpm/validation/manifest.py +++ b/ethpm/validation/manifest.py @@ -10,6 +10,10 @@ ValidationError as jsonValidationError, validate, ) +from jsonschema.validators import ( + Draft4Validator, + validator_for, +) from ethpm import ( ASSETS_DIR, @@ -75,7 +79,7 @@ def validate_manifest_against_schema(manifest: Dict[str, Any]) -> None: """ schema_data = _load_schema_data() try: - validate(manifest, schema_data) + validate(manifest, schema_data, cls=validator_for(schema_data, Draft4Validator)) except jsonValidationError as e: raise EthPMValidationError( f"Manifest invalid for schema version {schema_data['version']}. " diff --git a/setup.py b/setup.py index 83901c10eb..ca8440795e 100644 --- a/setup.py +++ b/setup.py @@ -73,7 +73,7 @@ "eth-utils>=1.4.0,<2.0.0", "hexbytes>=0.1.0,<1.0.0", "ipfshttpclient>=0.4.12,<1", - "jsonschema>=2.6.0,<3", + "jsonschema>=2.6.0,<4.0", "lru-dict>=1.1.6,<2.0.0", "protobuf>=3.0.0,<4", "pypiwin32>=223;platform_system=='Windows'",