From 6f3156026229c1d31a586259934d9b53b3c3d437 Mon Sep 17 00:00:00 2001 From: Stefan Reimer Date: Tue, 19 Apr 2022 12:47:36 +0200 Subject: [PATCH] fix: migrate to new Jinja2 V3 context decorator --- Makefile | 2 +- cloudbender/jinja.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 9de69a6..b159182 100644 --- a/Makefile +++ b/Makefile @@ -36,7 +36,7 @@ upload: $(PACKAGE_FILE) twine upload --repository-url https://upload.pypi.org/legacy/ dist/cloudbender-*.whl build: - podman build --rm --squash-all -t $(REPOSITORY):$(TAG) -t $(REPOSITORY):latest . + podman build --rm -t $(REPOSITORY):$(TAG) -t $(REPOSITORY):latest . test: @echo "Not implemented (yet)" diff --git a/cloudbender/jinja.py b/cloudbender/jinja.py index 34a621c..16294ab 100644 --- a/cloudbender/jinja.py +++ b/cloudbender/jinja.py @@ -23,7 +23,7 @@ import logging logger = logging.getLogger(__name__) -@jinja2.contextfunction +@jinja2.pass_context def option(context, attribute, default_value="", source="options"): """Get attribute from options data structure, default_value otherwise""" environment = context.environment @@ -45,7 +45,7 @@ def option(context, attribute, default_value="", source="options"): return default_value -@jinja2.contextfunction +@jinja2.pass_context def include_raw_gz(context, files=None, gz=True, remove_comments=False): jenv = context.environment output = "" @@ -88,7 +88,7 @@ def include_raw_gz(context, files=None, gz=True, remove_comments=False): return base64.b64encode(buf.getvalue()).decode("utf-8") -@jinja2.contextfunction +@jinja2.pass_context def raise_helper(context, msg): raise Exception(msg)