diff --git a/rally/consts.py b/rally/consts.py index 028d5a87dd..9dad5d757f 100644 --- a/rally/consts.py +++ b/rally/consts.py @@ -24,7 +24,7 @@ for each enum. (e.g. TaskStatus) from rally.common import utils -JSON_SCHEMA = "http://json-schema.org/draft-04/schema" +JSON_SCHEMA = "http://json-schema.org/draft-07/schema" class _TaskStatus(utils.ImmutableMixin, utils.EnumMixin): diff --git a/rally/plugins/common/runners/rps.py b/rally/plugins/common/runners/rps.py index 64bc0134f1..ad4eef69da 100644 --- a/rally/plugins/common/runners/rps.py +++ b/rally/plugins/common/runners/rps.py @@ -160,7 +160,7 @@ class RPSScenarioRunner(runner.ScenarioRunner): "description": "Generate constant requests per second " "during the whole workload.", "type": "number", - "exclusiveMinimum": True, + "exclusiveMinimum": 0, "minimum": 0 }, { diff --git a/rally/plugins/common/sla/iteration_time.py b/rally/plugins/common/sla/iteration_time.py index b389634d0a..d423f4355c 100644 --- a/rally/plugins/common/sla/iteration_time.py +++ b/rally/plugins/common/sla/iteration_time.py @@ -26,7 +26,7 @@ from rally.task import sla class IterationTime(sla.SLA): """Maximum time for one iteration in seconds.""" CONFIG_SCHEMA = {"type": "number", "minimum": 0.0, - "exclusiveMinimum": True} + "exclusiveMinimum": 0.0} def __init__(self, criterion_value): super(IterationTime, self).__init__(criterion_value) diff --git a/rally/plugins/common/sla/max_average_duration.py b/rally/plugins/common/sla/max_average_duration.py index ff7e53ce82..beb823015d 100644 --- a/rally/plugins/common/sla/max_average_duration.py +++ b/rally/plugins/common/sla/max_average_duration.py @@ -27,7 +27,7 @@ from rally.task import sla class MaxAverageDuration(sla.SLA): """Maximum average duration of one iteration in seconds.""" CONFIG_SCHEMA = {"type": "number", "minimum": 0.0, - "exclusiveMinimum": True} + "exclusiveMinimum": 0.0} def __init__(self, criterion_value): super(MaxAverageDuration, self).__init__(criterion_value) diff --git a/rally/plugins/common/sla/outliers.py b/rally/plugins/common/sla/outliers.py index 750d5653e2..ff9deb9f2c 100644 --- a/rally/plugins/common/sla/outliers.py +++ b/rally/plugins/common/sla/outliers.py @@ -38,7 +38,7 @@ class Outliers(sla.SLA): "max": {"type": "integer", "minimum": 0}, "min_iterations": {"type": "integer", "minimum": 3}, "sigmas": {"type": "number", "minimum": 0.0, - "exclusiveMinimum": True} + "exclusiveMinimum": 0.0} }, "additionalProperties": False, } diff --git a/rally/task/utils.py b/rally/task/utils.py index 4246fe1083..74598920bf 100644 --- a/rally/task/utils.py +++ b/rally/task/utils.py @@ -326,7 +326,7 @@ class ActionBuilder(object): ITEM_TEMPLATE = { "type": "integer", "minimum": 0, - "exclusiveMinimum": True, + "exclusiveMinimum": 0.0, "optional": True } diff --git a/requirements.txt b/requirements.txt index 329da412eb..340bfcafb2 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,7 +6,7 @@ alembic # MIT decorator # new BSD License Jinja2 # BSD -jsonschema<3.0.0 # MIT +jsonschema # MIT netaddr # BSD oslo.config!=4.3.0,!=4.4.0 # Apache Software License # do not forget to remove `testresources` from test-requirements. it is a diff --git a/upper-constraints.txt b/upper-constraints.txt index 89b95b7900..50d198a411 100644 --- a/upper-constraints.txt +++ b/upper-constraints.txt @@ -17,7 +17,7 @@ idna==2.6 ipaddress==1.0.19 iso8601==0.1.12 Jinja2==2.10 -jsonschema==2.6.0 +jsonschema==3.0.1 linecache2==1.0.0 Mako==1.0.7 MarkupSafe==1.0