From 987434e88f318acaf4a6f4fe900e44c1fdcd3b4d Mon Sep 17 00:00:00 2001 From: Sascha Peilicke Date: Thu, 1 Aug 2013 16:55:33 +0200 Subject: [PATCH] Port Cheetah templates to Jinja2 Cheetah is unmaintained since 2010 and it's unlikely to get Python3 support soon. Also, the rest of OpenStack (mostly) standardized on Jinja2. Implements: blueprint jinja-templating-conversion Change-Id: Ia15f00ee96d3c1d55d7c290f20ccc988e4c52e1a --- .coveragerc | 2 +- requirements.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.coveragerc b/.coveragerc index c89967dfe..ba208274f 100644 --- a/.coveragerc +++ b/.coveragerc @@ -1,7 +1,7 @@ [run] branch = True source = nova -omit = nova/tests/*,nova/openstack/*,DynamicallyCompiledCheetahTemplate.py +omit = nova/tests/*,nova/openstack/* [report] ignore-errors = True diff --git a/requirements.txt b/requirements.txt index b8e8c443e..2e4705abe 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,12 +1,12 @@ d2to1>=0.2.10,<0.3 pbr>=0.5.16,<0.6 SQLAlchemy>=0.7.8,<0.7.99 -Cheetah>=2.4.4 amqplib>=0.6.1 anyjson>=0.2.4 argparse boto eventlet>=0.9.17 +Jinja2 kombu>=1.0.4 lxml>=2.3 routes>=1.12.3