Skip to content

Commit b50af13

Browse files
Zac-HDZac-HD
committed
Bump pinned deps
1 parent 20a09d6 commit b50af13

File tree

4 files changed

+75
-43
lines changed

4 files changed

+75
-43
lines changed

‎deps/check.txt

+16-16
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
# pip-compile --output-file=deps/check.txt deps/check.in
66
#
77
appdirs==1.4.4 # via black
8-
attrs==20.1.0 # via black, flake8-bugbear
8+
attrs==20.2.0 # via flake8-bugbear
99
autoflake==1.4 # via shed
1010
bandit==1.6.2 # via flake8-bandit
11-
black==19.10b0 # via shed
11+
black==20.8b1 # via shed
1212
click==7.1.2 # via black, pybetter, pyemojify
1313
colorama==0.4.3 # via bandit
1414
com2ann==0.1.1 # via -r deps/check.in
@@ -19,35 +19,35 @@ flake8-comprehensions==3.2.3 # via -r deps/check.in
1919
flake8-docstrings==1.5.0 # via -r deps/check.in
2020
flake8-polyfill==1.0.2 # via flake8-bandit, pep8-naming
2121
flake8-print==3.1.4 # via -r deps/check.in
22-
flake8==3.8.3 # via -r deps/check.in, flake8-bandit, flake8-bugbear, flake8-builtins, flake8-comprehensions, flake8-docstrings, flake8-polyfill, flake8-print
22+
flake8==3.8.4 # via -r deps/check.in, flake8-bandit, flake8-bugbear, flake8-builtins, flake8-comprehensions, flake8-docstrings, flake8-polyfill, flake8-print
2323
gitdb==4.0.5 # via gitpython
24-
gitpython==3.1.7 # via bandit
25-
importlib-metadata==1.7.0 # via flake8, flake8-comprehensions, stevedore
26-
isort==5.4.2 # via shed
27-
libcst==0.3.10 # via pybetter
24+
gitpython==3.1.9 # via bandit
25+
importlib-metadata==2.0.0 # via flake8, flake8-comprehensions, stevedore
26+
isort==5.5.4 # via shed
27+
libcst==0.3.12 # via pybetter
2828
mccabe==0.6.1 # via flake8
29-
mypy-extensions==0.4.3 # via mypy, typing-inspect
29+
mypy-extensions==0.4.3 # via black, mypy, typing-inspect
3030
mypy==0.782 # via -r deps/check.in
3131
pathspec==0.8.0 # via black
32-
pbr==5.4.5 # via stevedore
32+
pbr==5.5.0 # via stevedore
3333
pep8-naming==0.11.1 # via -r deps/check.in
3434
pybetter==0.3.5 # via shed
3535
pycodestyle==2.6.0 # via flake8, flake8-bandit, flake8-print
36-
pydocstyle==5.1.0 # via flake8-docstrings
36+
pydocstyle==5.1.1 # via flake8-docstrings
3737
pyemojify==0.2.0 # via pybetter
3838
pyflakes==2.2.0 # via autoflake, flake8
39-
pygments==2.6.1 # via pybetter
39+
pygments==2.7.1 # via pybetter
4040
pyupgrade==2.7.2 # via shed
4141
pyyaml==5.3.1 # via bandit, libcst
42-
regex==2020.7.14 # via black
43-
shed==0.2.3 # via -r deps/check.in
42+
regex==2020.9.27 # via black
43+
shed==0.2.4 # via -r deps/check.in
4444
six==1.15.0 # via bandit, flake8-print
4545
smmap==3.0.4 # via gitdb
4646
snowballstemmer==2.0.0 # via pydocstyle
47-
stevedore==3.2.0 # via bandit
47+
stevedore==3.2.2 # via bandit
4848
tokenize-rt==4.0.0 # via pyupgrade
4949
toml==0.10.1 # via black
5050
typed-ast==1.4.1 # via black, mypy
51-
typing-extensions==3.7.4.3 # via libcst, mypy, typing-inspect
51+
typing-extensions==3.7.4.3 # via black, libcst, mypy, typing-inspect
5252
typing-inspect==0.6.0 # via libcst
53-
zipp==3.1.0 # via importlib-metadata
53+
zipp==3.3.0 # via importlib-metadata

‎deps/test.txt

+8-9
Original file line numberDiff line numberDiff line change
@@ -6,33 +6,32 @@
66
#
77
apipkg==1.5 # via execnet
88
atomicwrites==1.4.0 # via pytest
9-
attrs==20.1.0 # via hypothesis, jsonschema, pytest
9+
attrs==20.2.0 # via hypothesis, jsonschema, pytest
1010
colorama==0.4.3 # via pytest
11-
coverage==5.2.1 # via pytest-cov
11+
coverage==5.3 # via pytest-cov
1212
execnet==1.7.1 # via pytest-xdist
13-
hypothesis==5.29.0 # via hypothesis-jsonschema (setup.py)
13+
hypothesis==5.37.0 # via hypothesis-jsonschema (setup.py)
1414
idna==2.10 # via jsonschema
15-
importlib-metadata==1.7.0 # via jsonschema, pluggy, pytest
15+
importlib-metadata==2.0.0 # via jsonschema, pluggy, pytest
1616
iniconfig==1.0.1 # via pytest
1717
jsonpointer==2.0 # via jsonschema
1818
jsonschema[format]==3.2.0 # via -r deps/test.in, hypothesis-jsonschema (setup.py)
19-
more-itertools==8.4.0 # via pytest
2019
packaging==20.4 # via pytest
2120
pluggy==0.13.1 # via pytest
2221
py==1.9.0 # via pytest, pytest-forked
2322
pyparsing==2.4.7 # via packaging
24-
pyrsistent==0.16.0 # via jsonschema
23+
pyrsistent==0.17.3 # via jsonschema
2524
pytest-cov==2.10.1 # via -r deps/test.in
2625
pytest-forked==1.3.0 # via pytest-xdist
2726
pytest-xdist==2.1.0 # via -r deps/test.in
28-
pytest==6.0.1 # via -r deps/test.in, pytest-cov, pytest-forked, pytest-xdist
27+
pytest==6.1.1 # via -r deps/test.in, pytest-cov, pytest-forked, pytest-xdist
2928
rfc3987==1.3.8 # via jsonschema
30-
six==1.15.0 # via jsonschema, packaging, pyrsistent
29+
six==1.15.0 # via jsonschema, packaging
3130
sortedcontainers==2.2.2 # via hypothesis
3231
strict-rfc3339==0.7 # via jsonschema
3332
toml==0.10.1 # via pytest
3433
webcolors==1.11.1 # via jsonschema
35-
zipp==3.1.0 # via importlib-metadata
34+
zipp==3.3.0 # via importlib-metadata
3635

3736
# The following packages are considered to be unsafe in a requirements file:
3837
# setuptools

‎tests/corpus-suite-schemas.json

+50-17
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@
8686
"draft4/base URI change": {
8787
"id": "http://localhost:1234/",
8888
"items": {
89-
"id": "folder/",
89+
"id": "baseUriChange/",
9090
"items": {
9191
"$ref": "folderInteger.json"
9292
}
@@ -95,7 +95,7 @@
9595
"draft4/base URI change - change folder": {
9696
"definitions": {
9797
"baz": {
98-
"id": "folder/",
98+
"id": "baseUriChangeFolder/",
9999
"items": {
100100
"$ref": "folderInteger.json"
101101
},
@@ -121,7 +121,7 @@
121121
"type": "array"
122122
}
123123
},
124-
"id": "folder/"
124+
"id": "baseUriChangeFolderInSubschema/"
125125
}
126126
},
127127
"id": "http://localhost:1234/scope_change_defs2.json",
@@ -595,7 +595,7 @@
595595
"draft7/base URI change": {
596596
"$id": "http://localhost:1234/",
597597
"items": {
598-
"$id": "folder/",
598+
"$id": "baseUriChange/",
599599
"items": {
600600
"$ref": "folderInteger.json"
601601
}
@@ -605,7 +605,7 @@
605605
"$id": "http://localhost:1234/scope_change_defs1.json",
606606
"definitions": {
607607
"baz": {
608-
"$id": "folder/",
608+
"$id": "baseUriChangeFolder/",
609609
"items": {
610610
"$ref": "folderInteger.json"
611611
},
@@ -623,7 +623,7 @@
623623
"$id": "http://localhost:1234/scope_change_defs2.json",
624624
"definitions": {
625625
"baz": {
626-
"$id": "folder/",
626+
"$id": "baseUriChangeFolderInSubschema/",
627627
"definitions": {
628628
"bar": {
629629
"items": {
@@ -666,6 +666,16 @@
666666
"draft7/const with 1 does not match true": {
667667
"const": 1
668668
},
669+
"draft7/const with [false] does not match [0]": {
670+
"const": [
671+
false
672+
]
673+
},
674+
"draft7/const with [true] does not match [1]": {
675+
"const": [
676+
true
677+
]
678+
},
669679
"draft7/const with array": {
670680
"const": [
671681
{
@@ -688,6 +698,16 @@
688698
"draft7/const with true does not match 1": {
689699
"const": true
690700
},
701+
"draft7/const with {\"a\": false} does not match {\"a\": 0}": {
702+
"const": {
703+
"a": false
704+
}
705+
},
706+
"draft7/const with {\"a\": true} does not match {\"a\": 1}": {
707+
"const": {
708+
"a": true
709+
}
710+
},
691711
"draft7/contains keyword validation": {
692712
"contains": {
693713
"minimum": 5
@@ -785,25 +805,27 @@
785805
"type": "object"
786806
},
787807
"draft7/escaped pointer ref": {
788-
"percent%field": {
789-
"type": "integer"
808+
"definitions": {
809+
"percent%field": {
810+
"type": "integer"
811+
},
812+
"slash/field": {
813+
"type": "integer"
814+
},
815+
"tilde~field": {
816+
"type": "integer"
817+
}
790818
},
791819
"properties": {
792820
"percent": {
793-
"$ref": "#/percent%25field"
821+
"$ref": "#/definitions/percent%25field"
794822
},
795823
"slash": {
796-
"$ref": "#/slash~1field"
824+
"$ref": "#/definitions/slash~1field"
797825
},
798826
"tilde": {
799-
"$ref": "#/tilde~0field"
827+
"$ref": "#/definitions/tilde~0field"
800828
}
801-
},
802-
"slash/field": {
803-
"type": "integer"
804-
},
805-
"tilde~field": {
806-
"type": "integer"
807829
}
808830
},
809831
"draft7/exclusiveMaximum validation": {
@@ -861,6 +883,17 @@
861883
"minimum": -10
862884
}
863885
},
886+
"draft7/if appears at the end when serialized (keyword processing sequence)": {
887+
"else": {
888+
"const": "other"
889+
},
890+
"if": {
891+
"maxLength": 4
892+
},
893+
"then": {
894+
"const": "yes"
895+
}
896+
},
864897
"draft7/if with boolean schema false": {
865898
"else": {
866899
"const": "else"

‎tests/test_canonicalise.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ def test_canonicalises_to_expected(schema, expected):
397397
None,
398398
),
399399
([{"items": {"pattern": "a"}}, {"items": {"pattern": "b"}}], None),
400-
([{"items": [{"pattern": "a"}]}, {"items": [{"pattern": "b"}]}], None,),
400+
([{"items": [{"pattern": "a"}]}, {"items": [{"pattern": "b"}]}], None),
401401
(
402402
[
403403
{"items": [{}], "additionalItems": {"pattern": "a"}},

0 commit comments

Comments
 (0)