Skip to content

Commit a5a5a45

Browse files
committed
Squashed 'json/' changes from 6b673312..2903943b
2903943b Merge pull request #277 from json-schema-org/non-string-formats 95425df4 Move tests for builtin formats ignoring non-strings upstream. aa71850e Merge pull request #278 from gregsdennis/master 4b638034 updated 2019-09 references to correct schema uri 8656a718 moved 2019-08 tests to 2019-09; fixed a few 2019-06 $refs 0f888a8f Make ajv's tests not fail the build. 3922a3c2 Run the suite sanity checks on Py3. 9eda690f Minor style. git-subtree-dir: json git-subtree-split: 2903943b4c31a33a9dc8b017174deefdf46f5213
1 parent 6f05b2e commit a5a5a45

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+2144
-17
lines changed

.travis.yml

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
language: python
2-
python: "2.7"
2+
python: "3.7"
33
node_js: "9"
44
install:
55
- pip install tox
6-
- npm install
76
script:
87
- tox
9-
- npm test
8+
- npm install && npm test || true

bin/jsonschema_suite

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
#! /usr/bin/env python
1+
#! /usr/bin/env python3
22
from __future__ import print_function
33
from pprint import pformat
44
import argparse
@@ -149,7 +149,7 @@ class SanityTests(unittest.TestCase):
149149

150150
expected = {
151151
os.path.join(REMOTES_DIR, path): contents
152-
for path, contents in REMOTES.iteritems()
152+
for path, contents in REMOTES.items()
153153
}
154154

155155
missing = set(files).symmetric_difference(expected)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

tests/draft2019-08/defs.json renamed to tests/draft2019-09/defs.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[
22
{
33
"description": "valid definition",
4-
"schema": {"$ref": "http://json-schema.org/draft/2019-06/schema#"},
4+
"schema": {"$ref": "https://json-schema.org/draft/2019-09/schema"},
55
"tests": [
66
{
77
"description": "valid definition schema",
@@ -12,7 +12,7 @@
1212
},
1313
{
1414
"description": "invalid definition",
15-
"schema": {"$ref": "http://json-schema.org/draft/2019-06/schema#"},
15+
"schema": {"$ref": "https://json-schema.org/draft/2019-09/schema"},
1616
"tests": [
1717
{
1818
"description": "invalid definition schema",
File renamed without changes.

0 commit comments

Comments
 (0)