Skip to content

Commit

Permalink
Merge pull request #3910 from open-formulieren/feature/3688-json-sche…
Browse files Browse the repository at this point in the history 
…ma-parsing

[#3688] Add utility function to iter over JSON schema
  • Loading branch information
@Viicos
Viicos authored Feb 26, 2024
2 parents 7504f61 + 78a9fa5 commit 1673fbc
Show file tree
Hide file tree
Showing 7 changed files with 565 additions and 44 deletions.
3 changes: 3 additions & 0 deletions requirements/base.in
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ defusedxml
furl
glom
maykin-json-logic-py
jsonschema
jsonschema_specifications
jq
html5lib
# see https://github.com/onelogin/python3-saml/issues/292 and
Expand All @@ -24,6 +26,7 @@ python-magic
tablib[xlsx]
tinycss2
xmltodict
referencing
self-certifi
semantic-version
tabulate
Expand Down
31 changes: 22 additions & 9 deletions requirements/base.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,11 @@ asn1crypto==1.5.1
# via webauthn
async-timeout==4.0.2
# via redis
attrs==20.3.0
attrs==23.2.0
# via
# glom
# jsonschema
# referencing
# zeep
beautifulsoup4==4.10.0
# via o365
Expand Down Expand Up @@ -284,15 +285,19 @@ josepy==1.8.0
# via mozilla-django-oidc
jq==1.3.0
# via -r requirements/base.in
jsonschema==4.17.3
jsonschema==4.21.1
# via
# -r requirements/base.in
# drf-jsonschema-serializer
# drf-spectacular
# jsonschema-spec
# openapi-schema-validator
# openapi-spec-validator
jsonschema-spec==0.1.6
jsonschema-spec==0.2.4
# via openapi-spec-validator
jsonschema-specifications==2023.7.1
# via
# jsonschema
# openapi-schema-validator
kombu==5.2.4
# via celery
lazy-object-proxy==1.9.0
Expand Down Expand Up @@ -324,11 +329,11 @@ o365==2.0.31
# via -r requirements/base.in
oauthlib==3.2.2
# via requests-oauthlib
openapi-schema-validator==0.4.4
openapi-schema-validator==0.6.2
# via openapi-spec-validator
openapi-spec-validator==0.5.5
openapi-spec-validator==0.6.0
# via openapi3-parser
openapi3-parser==1.1.11
openapi3-parser==1.1.16
# via -r requirements/base.in
openpyxl==3.0.7
# via tablib
Expand Down Expand Up @@ -373,8 +378,6 @@ pyphen==0.14.0
# via weasyprint
pypng==0.20220715.0
# via qrcode
pyrsistent==0.17.3
# via jsonschema
python-dateutil==2.8.2
# via
# django-camunda
Expand Down Expand Up @@ -407,6 +410,12 @@ redis==4.5.4
# celery-once
# django-redis
# portalocker
referencing==0.30.2
# via
# -r requirements/base.in
# jsonschema
# jsonschema-spec
# jsonschema-specifications
requests==2.31.0
# via
# ape-pie
Expand All @@ -431,6 +440,10 @@ requests-toolbelt==1.0.0
# via zeep
rfc3339-validator==0.1.4
# via openapi-schema-validator
rpds-py==0.18.0
# via
# jsonschema
# referencing
ruamel-yaml==0.17.32
# via prance
ruamel-yaml-clib==0.2.7
Expand Down
38 changes: 26 additions & 12 deletions requirements/ci.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,14 @@ async-timeout==4.0.2
# -c requirements/base.txt
# -r requirements/base.txt
# redis
attrs==20.3.0
attrs==23.2.0
# via
# -c requirements/base.txt
# -r requirements/base.txt
# glom
# hypothesis
# jsonschema
# referencing
# zeep
babel==2.9.1
# via sphinx
Expand Down Expand Up @@ -529,20 +530,25 @@ jq==1.3.0
# via
# -c requirements/base.txt
# -r requirements/base.txt
jsonschema==4.17.3
jsonschema==4.21.1
# via
# -c requirements/base.txt
# -r requirements/base.txt
# drf-jsonschema-serializer
# drf-spectacular
# jsonschema-spec
# openapi-schema-validator
# openapi-spec-validator
jsonschema-spec==0.1.6
jsonschema-spec==0.2.4
# via
# -c requirements/base.txt
# -r requirements/base.txt
# openapi-spec-validator
jsonschema-specifications==2023.7.1
# via
# -c requirements/base.txt
# -r requirements/base.txt
# jsonschema
# openapi-schema-validator
kombu==5.2.4
# via
# -c requirements/base.txt
Expand Down Expand Up @@ -614,17 +620,17 @@ oauthlib==3.2.2
# -c requirements/base.txt
# -r requirements/base.txt
# requests-oauthlib
openapi-schema-validator==0.4.4
openapi-schema-validator==0.6.2
# via
# -c requirements/base.txt
# -r requirements/base.txt
# openapi-spec-validator
openapi-spec-validator==0.5.5
openapi-spec-validator==0.6.0
# via
# -c requirements/base.txt
# -r requirements/base.txt
# openapi3-parser
openapi3-parser==1.1.11
openapi3-parser==1.1.16
# via
# -c requirements/base.txt
# -r requirements/base.txt
Expand Down Expand Up @@ -745,11 +751,6 @@ pypng==0.20220715.0
# qrcode
pyquery==1.4.1
# via -r requirements/test-tools.in
pyrsistent==0.17.3
# via
# -c requirements/base.txt
# -r requirements/base.txt
# jsonschema
pytest==7.4.0
# via -r requirements/test-tools.in
python-dateutil==2.8.2
Expand Down Expand Up @@ -810,6 +811,13 @@ redis==4.5.4
# celery-once
# django-redis
# portalocker
referencing==0.30.2
# via
# -c requirements/base.txt
# -r requirements/base.txt
# jsonschema
# jsonschema-spec
# jsonschema-specifications
requests==2.31.0
# via
# -c requirements/base.txt
Expand Down Expand Up @@ -854,6 +862,12 @@ rfc3339-validator==0.1.4
# -c requirements/base.txt
# -r requirements/base.txt
# openapi-schema-validator
rpds-py==0.18.0
# via
# -c requirements/base.txt
# -r requirements/base.txt
# jsonschema
# referencing
ruamel-yaml==0.17.32
# via
# -c requirements/base.txt
Expand Down
38 changes: 26 additions & 12 deletions requirements/dev.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,13 +36,14 @@ async-timeout==4.0.2
# -c requirements/ci.txt
# -r requirements/ci.txt
# redis
attrs==20.3.0
attrs==23.2.0
# via
# -c requirements/ci.txt
# -r requirements/ci.txt
# glom
# hypothesis
# jsonschema
# referencing
# zeep
autopep8==1.5.7
# via django-silk
Expand Down Expand Up @@ -601,20 +602,25 @@ jq==1.3.0
# via
# -c requirements/ci.txt
# -r requirements/ci.txt
jsonschema==4.17.3
jsonschema==4.21.1
# via
# -c requirements/ci.txt
# -r requirements/ci.txt
# drf-jsonschema-serializer
# drf-spectacular
# jsonschema-spec
# openapi-schema-validator
# openapi-spec-validator
jsonschema-spec==0.1.6
jsonschema-spec==0.2.4
# via
# -c requirements/ci.txt
# -r requirements/ci.txt
# openapi-spec-validator
jsonschema-specifications==2023.7.1
# via
# -c requirements/ci.txt
# -r requirements/ci.txt
# jsonschema
# openapi-schema-validator
kombu==5.2.4
# via
# -c requirements/ci.txt
Expand Down Expand Up @@ -701,17 +707,17 @@ oauthlib==3.2.2
# -c requirements/ci.txt
# -r requirements/ci.txt
# requests-oauthlib
openapi-schema-validator==0.4.4
openapi-schema-validator==0.6.2
# via
# -c requirements/ci.txt
# -r requirements/ci.txt
# openapi-spec-validator
openapi-spec-validator==0.5.5
openapi-spec-validator==0.6.0
# via
# -c requirements/ci.txt
# -r requirements/ci.txt
# openapi3-parser
openapi3-parser==1.1.11
openapi3-parser==1.1.16
# via
# -c requirements/ci.txt
# -r requirements/ci.txt
Expand Down Expand Up @@ -863,11 +869,6 @@ pyquery==1.4.1
# via
# -c requirements/ci.txt
# -r requirements/ci.txt
pyrsistent==0.17.3
# via
# -c requirements/ci.txt
# -r requirements/ci.txt
# jsonschema
pytest==7.4.0
# via
# -c requirements/ci.txt
Expand Down Expand Up @@ -932,6 +933,13 @@ redis==4.5.4
# celery-once
# django-redis
# portalocker
referencing==0.30.2
# via
# -c requirements/ci.txt
# -r requirements/ci.txt
# jsonschema
# jsonschema-spec
# jsonschema-specifications
requests==2.31.0
# via
# -c requirements/ci.txt
Expand Down Expand Up @@ -978,6 +986,12 @@ rfc3339-validator==0.1.4
# -c requirements/ci.txt
# -r requirements/ci.txt
# openapi-schema-validator
rpds-py==0.18.0
# via
# -c requirements/ci.txt
# -r requirements/ci.txt
# jsonschema
# referencing
ruamel-yaml==0.17.32
# via
# -c requirements/ci.txt
Expand Down
Loading

0 comments on commit 1673fbc

Please sign in to comment.