#161 Force newer jinja2 in ipsilon-server-install and -upgrade-database
Merged 7 years ago by merlinthp. Opened 7 years ago by merlinthp.
merlinthp/ipsilon el6jinja  into  master

@@ -1,7 +1,7 @@ 

  #!/usr/bin/python

  # Copyright (C) 2014 Ipsilon project Contributors, for license see COPYING

  

- __requires__ = ['sqlalchemy >= 0.8']

+ __requires__ = ['sqlalchemy >= 0.8', 'jinja2 >= 2.4']

  import pkg_resources  # pylint: disable=unused-import

  

  from ipsilon.login.common import LoginMgrsInstall

@@ -2,7 +2,7 @@ 

  #

  # Copyright (C) 2015 Ipsilon project Contributors, for license see COPYING

  

- __requires__ = ['sqlalchemy >= 0.8']

+ __requires__ = ['sqlalchemy >= 0.8', 'jinja2 >= 2.4']

  import pkg_resources  # pylint: disable=unused-import

  

  from argparse import ArgumentParser

The main ipsilon server already requires a minimum version of jinja2 so
that it works on older OSes like EL6. The -server-install and
-upgrade-database scripts need it too.

Signed-off-by: Howard Johnson merlin@merlinthp.org

Ah, right. Looks good to me, thanks!

Commit 9ab53cd fixes this pull-request

Pull-Request has been merged by merlin@merlinthp.org

7 years ago