Merge pull request #344 from PyPlanet/bugfix/342

[BUGFIX] Make sure we don't enable auto reload on non debug setups.

pyplanet/core/ui/template.py

@@ -1,20 +1,38 @@
-from jinja2 import Environment, PackageLoader, select_autoescape
+from jinja2 import Environment, select_autoescape
 
+from pyplanet.conf import settings
 from pyplanet.core.ui.loader import PyPlanetLoader
 
 
 async def load_template(file):
 	return Template(file)
 
 
+class _EnvironmentManager:
+	def __init__(self):
+		self._environment = None
+
+	@property
+	def environment(self):
+		if not self._environment:
+			self._environment = Environment(
+				loader=PyPlanetLoader.get_loader(),
+				autoescape=select_autoescape(['html', 'xml', 'Txt', 'txt', 'ml', 'ms', 'script.txt', 'Script.Txt']),
+				auto_reload=bool(settings.DEBUG),
+			)
+		return self._environment
+
+EnvironmentManager = _EnvironmentManager()
+
+
 class Template:
 	"""
 	Template class manages the template file source and the rendering of it.
-	
+
 	Will also take care of the loader of the Jinja2 template engine.
-	
+
 	Some notable prefixes:
-	
+
 	- core.views: ``pyplanet.views.templates``.
 	- core.pyplanet: ``pyplanet.apps.core.pyplanet.templates``.
 	- core.maniaplanet: ``pyplanet.apps.core.pyplanet.templates``.
@@ -24,12 +42,8 @@ class Template:
 	"""
 
 	def __init__(self, file):
-
 		self.file = file
-		self.env = Environment(
-			loader=PyPlanetLoader.get_loader(),
-			autoescape=select_autoescape(['html', 'xml', 'Txt', 'txt', 'ml', 'ms', 'script.txt', 'Script.Txt']),
-		)
+		self.env = EnvironmentManager.environment
 		self.template = self.env.get_template(file)
 
 	async def render(self, **data):

tests/_scripts/travis_dedicated_start.sh

@@ -6,6 +6,11 @@ if [[ ${TOXENV} == *"integration"* ]]; then
 else
   exit 0
 fi
+# Check if we should use the second dedicated account instead.
+if [[ ${TOXENV} == *"py36-integration"* ]]; then
+  MP_USER="${MP_USER}2"
+fi
+
 
 BEFORE_PWD=`pwd`
 cd "$(dirname "$0")"