From f4f0862633bfda306d86835325e6572362d7cfdd Mon Sep 17 00:00:00 2001 From: Patrice Buriez Date: Fri, 9 Nov 2018 10:38:53 +0100 Subject: [PATCH] Remove Django from requirements and update docs Since ``yardstick report generate`` now uses Jinja2, there is no need for python-django, which was only being used for that command. Update docs accordingly, and provide links to InfluxDB, Jinja2 and Highcharts. JIRA: YARDSTICK-1367 Topic: report/html_table (3 of 11) Change-Id: I63ab03e0b57901f250920487760507062825d812 Signed-off-by: Emma Foley Signed-off-by: Patrice Buriez --- .../user/userguide/10-yardstick-user-interface.rst | 18 +++++++++++------- requirements.txt | 3 --- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/docs/testing/user/userguide/10-yardstick-user-interface.rst b/docs/testing/user/userguide/10-yardstick-user-interface.rst index cadec78ef..76890b29a 100644 --- a/docs/testing/user/userguide/10-yardstick-user-interface.rst +++ b/docs/testing/user/userguide/10-yardstick-user-interface.rst @@ -16,15 +16,19 @@ Command Description =========== -1. When the command is triggered using the task-id and the testcase -name provided the respective values are retrieved from the -database (influxdb in this particular case). +1. When the command is triggered, the relevant values for the + provided task-id and testcase name are retrieved from the + database (`InfluxDB`_ in this particular case). -2. The values are then formatted and then provided to the html -template framed with complete html body using Django Framework. +2. The values are then formatted and provided to the html + template to be rendered using `Jinja2`_. -3. Then the whole template is written into a html file. +3. Then the rendered template is written into a html file. The graph is framed with Timestamp on x-axis and output values (differ from testcase to testcase) on y-axis with the help of -"Highcharts". +`Highcharts`_. + +.. _InfluxDB: https://www.influxdata.com/time-series-platform/influxdb/ +.. _Jinja2: http://jinja.pocoo.org/docs/2.10/ +.. _Highcharts: https://www.highcharts.com/products/highcharts/ diff --git a/requirements.txt b/requirements.txt index 43d7120db..43a6c7fdb 100644 --- a/requirements.txt +++ b/requirements.txt @@ -15,9 +15,6 @@ ansible==2.5.5 # GPLv3; OSI Approved GNU General Public License v3 or backport-ipaddress==0.1; python_version <= "2.7" # OSI Approved Python Software Foundation License chainmap==1.0.2 # Python Software Foundation License; OSI Approved Python Software Foundation License cmd2==0.8.6 # MIT License; OSI Approved MIT License -django==1.8.17 # BSD; OSI Approved BSD License - # NOTE(ralonsoh): django must be bumped to 1.11.8; consider the migration notes [1] - # [1] https://docs.djangoproject.com/ja/1.11/ref/templates/upgrading/ docker-py==1.10.6 # OSI Approved Apache Software License extras==1.0.0 # OSI Approved MIT License flasgger==0.5.13 # MIT -- 2.16.6