From 25876b8abb288d64a156e7a3d51df0f2ac575dc3 Mon Sep 17 00:00:00 2001 From: Archana Date: Mon, 10 Jan 2022 01:55:26 +0530 Subject: [PATCH] Adding JSONSchema to CI scripts jsonschema is added to the ci scripts and Dockerfile Signed-off-by: Archana Signed-off-by: Asfandyar Orakzai --- scripts/driver.requirements.txt | 4 +++- tests/docker/bionic/Dockerfile | 9 +++------ 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/scripts/driver.requirements.txt b/scripts/driver.requirements.txt index 38838f58bc..2a1bef7e67 100644 --- a/scripts/driver.requirements.txt +++ b/scripts/driver.requirements.txt @@ -13,4 +13,6 @@ markupsafe < 2.1 Jinja2 >= 2.10.1 # Jinja2 >=2.10, <3.0 needs a separate package for type annotations types-Jinja2 - +# jsonschema > 3.2.0 is not compatible with Python 3.5, force 3.2.0 +jsonschema >= 3.2.0 +types-jsonschema diff --git a/tests/docker/bionic/Dockerfile b/tests/docker/bionic/Dockerfile index 5580679754..8fa58143eb 100644 --- a/tests/docker/bionic/Dockerfile +++ b/tests/docker/bionic/Dockerfile @@ -60,13 +60,10 @@ RUN apt-get update \ pkg-config \ && rm -rf /var/lib/apt/lists/* -# Jinja2 is required for driver dispatch code generation. +# Jinja2 and jsonschema is required for driver dispatch code generation. RUN python3 -m pip install \ - jinja2==2.10.1 types-jinja2 - - -RUN python3 -m pip install \ - jsonschema + jinja2==2.10.1 types-jinja2 \ + jsonschema==3.2.0 types-jsonschema # Build a static, legacy openssl from sources with sslv3 enabled # Based on https://gist.github.com/bmaupin/8caca3a1e8c3c5686141 (build-openssl.sh)