Hashar has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/399155 )
Change subject: Bump Jinja2 to 2.10+
......................................................................
Bump Jinja2 to 2.10+
So we can benefit from filters in set blocks. Example:
{% set foo | somefilter %}
this is a test
{% endset %}
https://github.com/pallets/jinja/pull/489
Change-Id: Ib10cb959bb58f8fa1dd22a6a5df0104052bf3c60
---
A docker_pkg/tests/fixtures/templates/filters_in_set_block
A docker_pkg/tests/test_dockerfile.py
M setup.py
3 files changed, 29 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/docker-images/docker-pkg
refs/changes/55/399155/1
diff --git a/docker_pkg/tests/fixtures/templates/filters_in_set_block
b/docker_pkg/tests/fixtures/templates/filters_in_set_block
new file mode 100644
index 0000000..5090767
--- /dev/null
+++ b/docker_pkg/tests/fixtures/templates/filters_in_set_block
@@ -0,0 +1,10 @@
+{#
+ Jinja 2.10 supports filters in set blocks
+ https://github.com/pallets/jinja/pull/489
+#}
+{%- set packages|replace('\n', ' ') -%}
+base-files
+gcc
+libc6
+{%- endset -%}
+{{ packages }}
diff --git a/docker_pkg/tests/test_dockerfile.py
b/docker_pkg/tests/test_dockerfile.py
new file mode 100644
index 0000000..cdfdad1
--- /dev/null
+++ b/docker_pkg/tests/test_dockerfile.py
@@ -0,0 +1,18 @@
+import os
+import unittest
+
+from docker_pkg import dockerfile
+from docker_pkg.tests import fixtures_dir
+
+class TestDockerfile(unittest.TestCase):
+
+ def test_TemplateEngine_supports_filters_in_set_block(self):
+
+ # Jinja 2.10 to support filters in set block
+ # https://github.com/pallets/jinja/pull/489
+ dockerfile.TemplateEngine.setup({}, [])
+ foo = dockerfile.from_template(
+ os.path.join(fixtures_dir, 'templates'),
+ 'filters_in_set_block'
+ )
+ self.assertEqual('base-files gcc libc6', foo.render())
diff --git a/setup.py b/setup.py
index 62e5f76..d878c3e 100755
--- a/setup.py
+++ b/setup.py
@@ -14,7 +14,7 @@
install_requires = [
'docker>=2.1.0',
'pyyaml>=3.11',
- 'jinja2>=2.9.6',
+ 'jinja2>=2.10',
'python-debian>=0.1.30',
'requests',
]
--
To view, visit https://gerrit.wikimedia.org/r/399155
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib10cb959bb58f8fa1dd22a6a5df0104052bf3c60
Gerrit-PatchSet: 1
Gerrit-Project: operations/docker-images/docker-pkg
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
