Fix distinct string formats

Zac-HD · Zac-HD · commit e6721e6f94cb · 2020-08-26T14:16:58.000+10:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,8 @@
 # Changelog
 
+#### 0.17.4 - 2020-08-26
+- fixed string schemas with different `format` keywords (#63)
+
 #### 0.17.3 - 2020-07-17
 - improved handling of overlapping `items` keywords (#58)
 
diff --git a/src/hypothesis_jsonschema/__init__.py b/src/hypothesis_jsonschema/__init__.py
@@ -3,7 +3,7 @@
 The only public API is `from_schema`; check the docstring for details.
 """
 
-__version__ = "0.17.3"
+__version__ = "0.17.4"
 __all__ = ["from_schema"]
 
 from ._from_schema import from_schema
diff --git a/src/hypothesis_jsonschema/_canonicalise.py b/src/hypothesis_jsonschema/_canonicalise.py
@@ -35,7 +35,7 @@
 TYPE_SPECIFIC_KEYS = (
     ("number", "multipleOf maximum exclusiveMaximum minimum exclusiveMinimum"),
     ("integer", "multipleOf maximum exclusiveMaximum minimum exclusiveMinimum"),
-    ("string", "maxLength minLength pattern contentEncoding contentMediaType"),
+    ("string", "maxLength minLength pattern format contentEncoding contentMediaType"),
     ("array", "items additionalItems maxItems minItems uniqueItems contains"),
     (
         "object",
diff --git a/tests/test_canonicalise.py b/tests/test_canonicalise.py
@@ -273,6 +273,13 @@ def test_canonicalises_to_expected(schema, expected):
         ([{"type": "integer"}, {"type": "number"}], {"type": "integer"}),
         ([{"multipleOf": 0.25}, {"multipleOf": 0.5}], {"multipleOf": 0.5}),
         ([{"multipleOf": 0.5}, {"multipleOf": 1.5}], {"multipleOf": 1.5}),
+        (
+            [
+                {"type": "string", "format": "color"},
+                {"type": "string", "format": "date-fullyear"},
+            ],
+            None,
+        ),
         (
             [
                 {"type": "integer", "multipleOf": 4},

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@`
`35`	`35`	`TYPE_SPECIFIC_KEYS = (`
`36`	`36`	`("number", "multipleOf maximum exclusiveMaximum minimum exclusiveMinimum"),`
`37`	`37`	`("integer", "multipleOf maximum exclusiveMaximum minimum exclusiveMinimum"),`
`38`		`- ("string", "maxLength minLength pattern contentEncoding contentMediaType"),`
	`38`	`+ ("string", "maxLength minLength pattern format contentEncoding contentMediaType"),`
`39`	`39`	`("array", "items additionalItems maxItems minItems uniqueItems contains"),`
`40`	`40`	`(`
`41`	`41`	`"object",`
Original file line number	Diff line number	Diff line change
`@@ -273,6 +273,13 @@ def test_canonicalises_to_expected(schema, expected):`
`273`	`273`	`([{"type": "integer"}, {"type": "number"}], {"type": "integer"}),`
`274`	`274`	`([{"multipleOf": 0.25}, {"multipleOf": 0.5}], {"multipleOf": 0.5}),`
`275`	`275`	`([{"multipleOf": 0.5}, {"multipleOf": 1.5}], {"multipleOf": 1.5}),`
	`276`	`+ (`
	`277`	`+ [`
	`278`	`+ {"type": "string", "format": "color"},`
	`279`	`+ {"type": "string", "format": "date-fullyear"},`
	`280`	`+ ],`
	`281`	`+ None,`
	`282`	`+ ),`
`276`	`283`	`(`
`277`	`284`	`[`
`278`	`285`	`{"type": "integer", "multipleOf": 4},`