diff options
| author | Matt Clay <mclay@redhat.com> | 2021-05-12 12:50:12 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-05-12 12:50:12 -0700 |
| commit | c3108305537447200873342b9a5f6f6377b0a9fd (patch) | |
| tree | 1a6dc5ca527b74460837a7024a92f835a2a2132d /changelogs | |
| parent | d8d20a2ff95547e11841e3fdd4f2d9caee9ade6c (diff) | |
| download | ansible-c3108305537447200873342b9a5f6f6377b0a9fd.tar.gz | |
[stable-2.9] CI and compat fixes for Jinja2 >= 3.0 (#74666) (#74672)
* [stable-2.9] CI and compat fixes for Jinja2 >= 3.0 (#74666)
* Add constraint for MarkupSafe
MarkupSafe >= 2.0.0 requires Python >= 3.6.0. Add a constraint for older Python versions
and fix the `groupby_filter` test.
* Fix template_jinja2_latest test.
* patch filter decorators on newer Jinja2
* Jinja2 >= 3.0 renames several filter decorators used by Ansible itself, as well as by filters in collections. This patch ensures that the old names are usable within Ansible and by collections without warnings or errors.
* Ignore docs-build issues.
* Remove unnecessary ignore.
* Disable failing nuage_vspk test.
* Fix inventory_aws_conformance integration test.
(cherry picked from commit f99d0248517c9dacc4594bc87d54626cdce59bfd)
Co-authored-by: Matt Clay <matt@mystile.com>
Co-authored-by: Matt Davis <mrd@redhat.com>.
Co-authored-by: Sam Doran <sdoran@redhat.com>
Diffstat (limited to 'changelogs')
| -rw-r--r-- | changelogs/fragments/ansible-test-markupsafe-constraint.yml | 2 | ||||
| -rw-r--r-- | changelogs/fragments/jinja2_decorator_renames.yml | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/changelogs/fragments/ansible-test-markupsafe-constraint.yml b/changelogs/fragments/ansible-test-markupsafe-constraint.yml new file mode 100644 index 0000000000..5c9091a3b9 --- /dev/null +++ b/changelogs/fragments/ansible-test-markupsafe-constraint.yml @@ -0,0 +1,2 @@ +bugfixes: + - ansible_test - add constraint for ``MarkupSafe`` (https://github.com/ansible/ansible/pull/74666) diff --git a/changelogs/fragments/jinja2_decorator_renames.yml b/changelogs/fragments/jinja2_decorator_renames.yml new file mode 100644 index 0000000000..90dbe5f305 --- /dev/null +++ b/changelogs/fragments/jinja2_decorator_renames.yml @@ -0,0 +1,2 @@ +bugfixes: + - filter plugins - patch new versions of Jinja2 to prevent warnings/errors on renamed filter decorators (https://github.com/ansible/ansible/issues/74667) |