tests docs: fix jsonschema dependency

- docs requires jsonschema which is only supported
  on python 3.7 or newer.  This causes 'make test'
  to fail on Ubuntu 18.04

Type: fix
Fixes: 9ad39c026

Change-Id: I0935c569ac102ea1dba6112f458e6ee10330e474
Signed-off-by: Dave Wallace <dwallacelf@gmail.com>

diff --git a/Makefile b/Makefile
index 3d44df1..84ae60c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# Copyright (c) 2016 Cisco and/or its affiliates.
+# Copyright (c) 2021 Cisco and/or its affiliates.
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at:
@@ -452,7 +452,7 @@ test-dep:
 
 .PHONY: test-doc
 test-doc:
-       @echo "make test-doc is DEPRECATED: use 'make doc'"
+       @echo "make test-doc is DEPRECATED: use 'make docs'"
        sleep 300
 
 .PHONY: test-wipe-doc

diff --git a/docs/Makefile b/docs/Makefile
index c37b9ae..8ccc818 100644 (file)
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -1,4 +1,15 @@
-# Minimal makefile for Sphinx documentation
+# Copyright (c) 2021 Cisco and/or its affiliates.
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at:
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
 #
 # We support MacOS for docs generation
 ifeq ($(shell uname),Darwin)
@@ -20,6 +31,10 @@ PIP_VERSION ?= $(shell grep 'PIP_VERSION=' ${WS_ROOT}/test/Makefile | cut -d'='
 PIP_TOOLS_VERSION ?= $(shell grep 'PIP_TOOLS_VERSION=' ${WS_ROOT}/test/Makefile | cut -d'=' -f2)
 
 PYTHON ?= "python3"
+PYTHON_VERSION_OK := $(shell $(PYTHON) -c "exec('import sys\nif sys.hexversion >= 0x03070000: print(\"true\")\nelse: print(\"false\")')")
+ifneq ($(PYTHON_VERSION_OK),true)
+$(error "ERROR: docs build requires python version >= to 3.7")
+endif
 
 # You can set these variables from the command line.
 SPHINXOPTS        = --keep-going -n -W
@@ -96,4 +111,3 @@ clean:
 
 .PHONY: build
 build: docs
-

diff --git a/test/requirements-3.txt b/test/requirements-3.txt
index 654f98f..7857823 100644 (file)
--- a/test/requirements-3.txt
+++ b/test/requirements-3.txt
@@ -135,7 +135,7 @@ jinja2==3.0.2 \
     --hash=sha256:827a0e32839ab1600d4eb1c4c33ec5a8edfbc5cb42dafa13b81f182f97784b45 \
     --hash=sha256:8569982d3f0889eed11dd620c706d39b60c36d6d25843961f33f77fb6bc6b20c
     # via sphinx
-jsonschema==4.1.2 \
+jsonschema==4.1.2 ; python_version >= "3.7" \
     --hash=sha256:166870c8ab27bd712a8627e0598de4685bd8d199c4d7bd7cacc3d941ba0c6ca0 \
     --hash=sha256:5c1a282ee6b74235057421fd0f766ac5f2972f77440927f6471c9e8493632fac
     # via -r requirements.txt

diff --git a/test/requirements.txt b/test/requirements.txt
index 661fca2..a9c93f4 100644 (file)
--- a/test/requirements.txt
+++ b/test/requirements.txt
@@ -19,4 +19,4 @@ sphinx-rtd-theme                        # MIT
 noiseprotocol                           # MIT
 recommonmark                            # MIT
 pyyaml                                  # MIT
-jsonschema                              # MIT
+jsonschema; python_version >= '3.7'     # MIT