openstack/kolla
Code Issues Proposed changes

Update code to Jinja 3.0 style

Browse Source 
Xena cycle uses Jinja 3.0 so let update Kolla's code for it.

From Jinja2 documentation:

jinja2.contextfunction(f: F) → F
    Pass the context as the first argument to the decorated function.
    Deprecated since version 3.0: Will be removed in Jinja 3.1. Use pass_context() instead.

jinja2.contextfilter(f)
    Pass the context as the first argument to the decorated function.
    Deprecated since version 3.0: Will be removed in Jinja 3.1. Use pass_context() instead.

Also bumped version in requirements.txt to same as in openstack/requirements

Change-Id: I51fbb7b9ff7c29cb355437efa4576be9bc035699
This commit is contained in:
Marcin Juszkiewicz 2021-06-28 10:36:39 +02:00
parent 796a8ec291
commit 383364e671
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
kolla/template/filters.py
View File

@ -12,11 +12,11 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
from jinja2 import contextfilter from jinja2 import pass_context
from jinja2 import Undefined from jinja2 import Undefined
@contextfilter @pass_context
def customizable(context, val_list, call_type): def customizable(context, val_list, call_type):
# NOTE(mgoddard): Don't try to customise undefined values. There are cases # NOTE(mgoddard): Don't try to customise undefined values. There are cases
# where this might happen, for example using a generic template overrides # where this might happen, for example using a generic template overrides

4
kolla/template/methods.py
View File

@ -15,7 +15,7 @@
import os import os
import yaml import yaml
from jinja2 import contextfunction from jinja2 import pass_context
def debian_package_install(packages, clean_package_cache=True): def debian_package_install(packages, clean_package_cache=True):
@ -71,7 +71,7 @@ def debian_package_install(packages, clean_package_cache=True):
return ' && '.join(cmds) return ' && '.join(cmds)
@contextfunction @pass_context
def handle_repos(context, reponames, mode): def handle_repos(context, reponames, mode):
"""NOTE(hrw): we need to handle CentOS, Debian and Ubuntu with one macro. """NOTE(hrw): we need to handle CentOS, Debian and Ubuntu with one macro.

2
requirements.txt
View File

@ -1,5 +1,5 @@
pbr!=2.1.0,>=2.0.0 # Apache-2.0 pbr!=2.1.0,>=2.0.0 # Apache-2.0
docker>=2.4.2 # Apache-2.0 docker>=2.4.2 # Apache-2.0
Jinja2>=2.8 # BSD License (3 clause) Jinja2>=3.0.1 # BSD License (3 clause)
GitPython>=1.0.1 # BSD License (3 clause) GitPython>=1.0.1 # BSD License (3 clause)
oslo.config>=5.1.0 # Apache-2.0 oslo.config>=5.1.0 # Apache-2.0