From 21c1252a7be6242dfc26e4b5e25b2e9ae7a7a0e4 Mon Sep 17 00:00:00 2001 From: Alessandro Molina Date: Tue, 21 May 2013 00:06:27 +0200 Subject: [PATCH] cope with the new jinja and markupsafe releases --- setup.py | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/setup.py b/setup.py index 3bd5e085..f2dcff9e 100644 --- a/setup.py +++ b/setup.py @@ -16,7 +16,6 @@ test_requirements = ['coverage', 'nose', 'zope.sqlalchemy >= 0.4', - 'jinja2', 'repoze.who', 'repoze.who.plugins.sa >= 1.0.1', 'Genshi >= 0.5.1', @@ -27,6 +26,13 @@ 'sqlalchemy' ] +if py_version == (3, 2): + #jinja2 2.7 is incompatible with Python 3.2 + test_requirements.append('jinja2 < 2.7') +else: + test_requirements.append('jinja2') + + if py_version[0] == 2: test_requirements.extend(['TurboKid >= 1.0.4', 'Kajiki >= 0.2.2', @@ -44,10 +50,15 @@ 'Beaker', 'decorator', 'PasteDeploy', - 'MarkupSafe', 'repoze.lru' ] +if py_version == (3, 2): + #markupsafe 0.16 is incompatible with Python 3.2 + install_requires.append('MarkupSafe < 0.16') +else: + install_requires.append('MarkupSafe') + setup( name='TurboGears2', version=version,