Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump jsonschema from 3.2.0 to 4.0.1 #2873

Merged
merged 6 commits into from
Jan 12, 2022
Merged

Bump jsonschema from 3.2.0 to 4.0.1 #2873

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
253383d
Bump jsonschema from 3.2.0 to 4.0.1
dependabot[bot] Oct 4, 2021
aa705f9
Loose dependency in setup
leplatrem Oct 7, 2021
9c9d9a1
Merge remote-tracking branch 'origin/master' into dependabot/pip/json…
leplatrem Jan 12, 2022
960fbf4
Upgrade jsonschema to 4.4.0
leplatrem Jan 12, 2022
aac5e54
Fix bravado tests
leplatrem Jan 12, 2022
f6df6c9
Bravado http_client is required in raw tests too
leplatrem Jan 12, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion dev-requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
black==21.12b0
bravado==11.0.3
bravado_core==5.17.0
flake8==4.0.1
isort==5.10.1
Expand All @@ -14,4 +15,4 @@ tox==3.24.5
WebTest==3.0.0
wheel==0.37.1
zest.releaser==6.22.2
zope.sqlalchemy==1.6
zope.sqlalchemy==1.6
2 changes: 1 addition & 1 deletion requirements.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ cornice==6.0.1
cornice-swagger==1.0.1
dockerflow==2021.7.0
jsonpatch==1.32
jsonschema==3.2.0
jsonschema==4.4.0
logging-color-formatter==1.0.2
newrelic==7.2.4.171
psycopg2-binary==2.9.3
Expand Down
2 changes: 1 addition & 1 deletion setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ install_requires =
cornice
cornice_swagger
dockerflow
jsonschema>=3.0.0
jsonschema
jsonpatch
logging-color-formatter
python-dateutil
Expand Down
6 changes: 5 additions & 1 deletion tests/openapi/support.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import unittest

from bravado.requests_client import RequestsClient
from bravado_core.request import IncomingRequest, unmarshal_request
from bravado_core.resource import build_resources
from bravado_core.response import OutgoingResponse, validate_response
Expand All @@ -22,14 +23,17 @@ def setUpClass(cls):
super().setUpClass()
cls.spec_dict = cls.app.get("/__api__").json
bravado_config = {
# Use models (Python classes) instead of dicts for #/definitions/{models}
# use_models causes us to break in bravado-core 4.13.0,
# probably because of
# https://github.com/Yelp/bravado-core/pull/254, and we
# don't actually use the generated models in our tests
# here anyhow.
"use_models": False
}
cls.spec = Spec.from_dict(cls.spec_dict, config=bravado_config)
cls.spec = Spec.from_dict(
cls.spec_dict, http_client=RequestsClient(), config=bravado_config
)
cls.resources = build_resources(cls.spec)

@classmethod
Expand Down
1 change: 1 addition & 0 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ commands =
python --version
py.test {posargs}
deps =
bravado
bravado_core
pytest
pytest-cache
Expand Down