update JSONSchema to Draft v7 (Kinto#1850)

DrFaustie · Nov 29, 2018 · a42bc66 · a42bc66
1 parent ab5abc6
commit a42bc66
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 5 deletions.
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
@@ -19,6 +19,7 @@ This document describes changes between each past release.
 **Internal changes**
 
 - Build the admin on the CI. (#1857)
+- Migrate JSON Hyper-Schema to Draft-07 (#1808)
 
 **Documentation**
 
@@ -37,12 +38,10 @@ This document describes changes between each past release.
 - Fix missing favicon and inline images in kinto-admin plugin
 
 **Internal changes**
-
 - Use mock from the standard library.
 - Blackify the whole code base (#1799, huge thanks to @Cnidarias for this!)
 - Upgrade kinto-admin to v1.22
 
-
 11.0.0 (2018-10-09)
 -------------------
 

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
@@ -65,6 +65,7 @@ Contributors
 * Pascal Roessner <[email protected]>
 * PeriGK <[email protected]>
 * Peter Bengtsson <[email protected]>
+* Peter Rassias <[email protected]>
 * realsumit <[email protected]>
 * Rektide <[email protected]>
 * Rémy Hubscher <[email protected]>

diff --git a/kinto/schema_validation.py b/kinto/schema_validation.py
@@ -1,5 +1,5 @@
 import colander
-from jsonschema import Draft4Validator, ValidationError, SchemaError, RefResolutionError, validate
+from jsonschema import Draft7Validator, ValidationError, SchemaError, RefResolutionError, validate
 from pyramid.settings import asbool
 
 from kinto.core import utils
@@ -27,7 +27,7 @@ def deserialize(self, cstruct=colander.null):
 
 def check_schema(data):
     try:
-        Draft4Validator.check_schema(data)
+        Draft7Validator.check_schema(data)
     except SchemaError as e:
         message = e.path.pop() + e.message
         raise ValidationError(message)

diff --git a/requirements.txt b/requirements.txt
@@ -12,7 +12,7 @@ idna==2.7
 iso8601==0.1.12
 jsonpatch==1.23
 jsonpointer==2.0
-jsonschema==2.6.0
+jsonschema==3.0.0a3
 logging-color-formatter==1.0.2
 newrelic==4.6.0.106
 PasteDeploy==1.5.2

diff --git a/tox.ini b/tox.ini
@@ -28,6 +28,7 @@ commands =
     py.test {posargs}
 deps =
     bravado_core
+    jsonschema==3.0.0a3
     pytest==3.3.2
     pytest-cache
     pytest-cover