allura-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kentontay...@apache.org
Subject [1/2] allura git commit: Upgrade jinja to 2.10 and avoid bytecode versioning problems
Date Fri, 07 Sep 2018 18:52:18 GMT
Repository: allura
Updated Branches:
  refs/heads/master 4b03e3cd6 -> eb46a49fb


Upgrade jinja to 2.10 and avoid bytecode versioning problems


Project: http://git-wip-us.apache.org/repos/asf/allura/repo
Commit: http://git-wip-us.apache.org/repos/asf/allura/commit/8c5d30e4
Tree: http://git-wip-us.apache.org/repos/asf/allura/tree/8c5d30e4
Diff: http://git-wip-us.apache.org/repos/asf/allura/diff/8c5d30e4

Branch: refs/heads/master
Commit: 8c5d30e41b0a455e4e0819d2828d70b60050bb45
Parents: b36b47c
Author: Dave Brondsema <dave@brondsema.net>
Authored: Wed Sep 5 11:22:10 2018 -0400
Committer: Dave Brondsema <dave@brondsema.net>
Committed: Wed Sep 5 11:22:10 2018 -0400

----------------------------------------------------------------------
 Allura/allura/config/app_cfg.py | 4 ++--
 requirements.txt                | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/allura/blob/8c5d30e4/Allura/allura/config/app_cfg.py
----------------------------------------------------------------------
diff --git a/Allura/allura/config/app_cfg.py b/Allura/allura/config/app_cfg.py
index f340a63..50028c1 100644
--- a/Allura/allura/config/app_cfg.py
+++ b/Allura/allura/config/app_cfg.py
@@ -82,10 +82,10 @@ class ForgeConfig(AppConfig):
                 import pylibmc
                 from jinja2 import MemcachedBytecodeCache
                 client = pylibmc.Client([config['memcached_host']])
-                bcc = MemcachedBytecodeCache(client)
+                bcc = MemcachedBytecodeCache(client, prefix='jinja2/{}/'.format(jinja2.__version__))
             elif cache_type == 'filesystem':
                 from jinja2 import FileSystemBytecodeCache
-                bcc = FileSystemBytecodeCache()
+                bcc = FileSystemBytecodeCache(pattern='__jinja2_{}_%s.cache'.format(jinja2.__version__))
         except:
             log.exception("Error encountered while setting up a" +
                           " %s-backed bytecode cache for Jinja" % cache_type)

http://git-wip-us.apache.org/repos/asf/allura/blob/8c5d30e4/requirements.txt
----------------------------------------------------------------------
diff --git a/requirements.txt b/requirements.txt
index 79ef7b5..3a9b136 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -19,7 +19,7 @@ html5lib==1.0.1
 # dep of oauth2
 httplib2==0.7.4
 iso8601==0.1.4
-Jinja2==2.9.6
+Jinja2==2.10
 Markdown==2.2.1
 Ming==0.5.6
 oauth2==1.5.170


Mime
View raw message