Update jinja2 requirement from <=3.1.4,>=3.1 to >=3.1,<=3.1.5 #6169

dependabot · 2024-12-23T20:47:07Z

Updates the requirements on jinja2 to permit the latest version.

Release notes

3.1.5

This is the Jinja 3.1.5 security fix release, which fixes security issues and bugs but does not otherwise change behavior and should not result in breaking changes compared to the latest feature release.

PyPI: https://pypi.org/project/Jinja2/3.1.5/ Changes: https://jinja.palletsprojects.com/changes/#version-3-1-5 Milestone: https://github.com/pallets/jinja/milestone/16?closed=1

The sandboxed environment handles indirect calls to str.format, such as by passing a stored reference to a filter that calls its argument. GHSA-q2x7-8rv6-6q7h

Escape template name before formatting it into error messages, to avoid issues with names that contain f-string syntax. #1792, GHSA-gmj6-6f8f-6699

Sandbox does not allow clear and pop on known mutable sequence types. #2032

Calling sync render for an async template uses asyncio.run. #1952

Avoid unclosed auto_aiter warnings. #1960

Return an aclose-able AsyncGenerator from Template.generate_async. #1960

Avoid leaving root_render_func() unclosed in Template.generate_async. #1960

Avoid leaving async generators unclosed in blocks, includes and extends. #1960

The runtime uses the correct concat function for the current environment when calling block references. #1701

Make |unique async-aware, allowing it to be used after another async-aware filter. #1781

|int filter handles OverflowError from scientific notation. #1921

Make compiling deterministic for tuple unpacking in a {% set ... %} call. #2021

Fix dunder protocol (copy/pickle/etc) interaction with Undefined objects. #2025

Fix copy/pickle support for the internal missing object. #2027

Environment.overlay(enable_async) is applied correctly. #2061

The error message from FileSystemLoader includes the paths that were searched. #1661

PackageLoader shows a clearer error message when the package does not contain the templates directory. #1705

Improve annotations for methods returning copies. #1880

urlize does not add mailto: to values like @a@b. #1870

Tests decorated with @pass_context can be used with the |select filter. #1624

Using set for multiple assignment (a, b = 1, 2) does not fail when the target is a namespace attribute. #1413

Using set in all branches of {% if %}{% elif %}{% else %} blocks does not cause the variable to be considered initially undefined. #1253

Changelog

Sourced from jinja2's changelog.

Version 3.1.5

Released 2024-12-21

The sandboxed environment handles indirect calls to str.format, such as by passing a stored reference to a filter that calls its argument. :ghsa:q2x7-8rv6-6q7h

Escape template name before formatting it into error messages, to avoid issues with names that contain f-string syntax. :issue:1792, :ghsa:gmj6-6f8f-6699

Sandbox does not allow clear and pop on known mutable sequence types. :issue:2032

Calling sync render for an async template uses asyncio.run. :pr:1952

Avoid unclosed auto_aiter warnings. :pr:1960

Return an aclose-able AsyncGenerator from Template.generate_async. :pr:1960

Avoid leaving root_render_func() unclosed in Template.generate_async. :pr:1960

Avoid leaving async generators unclosed in blocks, includes and extends. :pr:1960

The runtime uses the correct concat function for the current environment when calling block references. :issue:1701

Make |unique async-aware, allowing it to be used after another async-aware filter. :issue:1781

|int filter handles OverflowError from scientific notation. :issue:1921

Make compiling deterministic for tuple unpacking in a {% set ... %} call. :issue:2021

Fix dunder protocol (copy/pickle/etc) interaction with Undefined objects. :issue:2025

Fix copy/pickle support for the internal missing object. :issue:2027

Environment.overlay(enable_async) is applied correctly. :pr:2061

The error message from FileSystemLoader includes the paths that were searched. :issue:1661

PackageLoader shows a clearer error message when the package does not contain the templates directory. :issue:1705

Improve annotations for methods returning copies. :pr:1880

urlize does not add mailto: to values like @a@b. :pr:1870

Tests decorated with @pass_context`` can be used with the ``|select`` filter. :issue:1624`

Using set for multiple assignment (a, b = 1, 2) does not fail when the target is a namespace attribute. :issue:1413

Using set in all branches of {% if %}{% elif %}{% else %} blocks does not cause the variable to be considered initially undefined. :issue:1253

... (truncated)

Commits

877f6e5 release version 3.1.5
8d58859 remove test pypi
eda8fe8 update dev dependencies
c8fdce1 Fix bug involving calling set on a template parameter within all branches of ...
66587ce Fix bug where set would sometimes fail within if
fbc3a69 Add support for namespaces in tuple parsing (#1664)
b8f4831 more comments about nsref assignment
ee83219 Add support for namespaces in tuple assignment
1d55cdd Triple quotes in docs (#2064)
8a8eafc edit block assignment section
Additional commits viewable in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting @dependabot rebase.

Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR:

@dependabot rebase will rebase this PR
@dependabot recreate will recreate this PR, overwriting any edits that have been made to it
@dependabot merge will merge this PR after your CI passes on it
@dependabot squash and merge will squash and merge this PR after your CI passes on it
@dependabot cancel merge will cancel a previously requested merge and block automerging
@dependabot reopen will reopen this PR if it is closed
@dependabot close will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually
@dependabot show <dependency name> ignore conditions will show all of the ignore conditions of the specified dependency
@dependabot ignore this major version will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself)
@dependabot ignore this minor version will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself)
@dependabot ignore this dependency will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

Updates the requirements on [jinja2](https://github.com/pallets/jinja) to permit the latest version. - [Release notes](https://github.com/pallets/jinja/releases) - [Changelog](https://github.com/pallets/jinja/blob/main/CHANGES.rst) - [Commits](pallets/jinja@3.1.0...3.1.5) --- updated-dependencies: - dependency-name: jinja2 dependency-type: direct:production ... Signed-off-by: dependabot[bot] <[email protected]>

patchback · 2025-01-08T14:14:54Z

Backport to 3.22: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply d2f2777 on top of patchback/backports/3.22/d2f2777d845c591e484b8f2bac72e036771860ff/pr-6169

Backporting merged PR #6169 into main

Ensure you have a local repo clone of your fork. Unless you cloned it
from the upstream, this would be your origin remote.
Make sure you have an upstream repo added as a remote too. In these
instructions you'll refer to it by the name upstream. If you don't
have it, here's how you can add it:
```
$ git remote add upstream https://github.com/pulp/pulpcore.git
```

Ensure you have the latest copy of upstream and prepare a branch
that will hold the backported code:

$ git fetch upstream
$ git checkout -b patchback/backports/3.22/d2f2777d845c591e484b8f2bac72e036771860ff/pr-6169 upstream/3.22

Now, cherry-pick PR Update jinja2 requirement from <=3.1.4,>=3.1 to >=3.1,<=3.1.5 #6169 contents into that branch:
```
$ git cherry-pick -x d2f2777d845c591e484b8f2bac72e036771860ff
```
If it'll yell at you with something like fatal: Commit d2f2777d845c591e484b8f2bac72e036771860ff is a merge but no -m option was given., add -m 1 as follows instead:
```
$ git cherry-pick -m1 -x d2f2777d845c591e484b8f2bac72e036771860ff
```
At this point, you'll probably encounter some merge conflicts. You must
resolve them in to preserve the patch from PR Update jinja2 requirement from <=3.1.4,>=3.1 to >=3.1,<=3.1.5 #6169 as close to the
original as possible.

Push this branch to your fork on GitHub:

$ git push origin patchback/backports/3.22/d2f2777d845c591e484b8f2bac72e036771860ff/pr-6169

Create a PR, ensure that the CI is green. If it's not — update it so that
the tests and any other checks pass. This is it!
Now relax and wait for the maintainers to process your pull request
when they have some cycles to do reviews. Don't worry — they'll tell you if
any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

patchback · 2025-01-08T14:14:54Z

Backport to 3.39: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply d2f2777 on top of patchback/backports/3.39/d2f2777d845c591e484b8f2bac72e036771860ff/pr-6169

Backporting merged PR #6169 into main

Ensure you have a local repo clone of your fork. Unless you cloned it
from the upstream, this would be your origin remote.
Make sure you have an upstream repo added as a remote too. In these
instructions you'll refer to it by the name upstream. If you don't
have it, here's how you can add it:
```
$ git remote add upstream https://github.com/pulp/pulpcore.git
```

Ensure you have the latest copy of upstream and prepare a branch
that will hold the backported code:

$ git fetch upstream
$ git checkout -b patchback/backports/3.39/d2f2777d845c591e484b8f2bac72e036771860ff/pr-6169 upstream/3.39

Now, cherry-pick PR Update jinja2 requirement from <=3.1.4,>=3.1 to >=3.1,<=3.1.5 #6169 contents into that branch:
```
$ git cherry-pick -x d2f2777d845c591e484b8f2bac72e036771860ff
```
If it'll yell at you with something like fatal: Commit d2f2777d845c591e484b8f2bac72e036771860ff is a merge but no -m option was given., add -m 1 as follows instead:
```
$ git cherry-pick -m1 -x d2f2777d845c591e484b8f2bac72e036771860ff
```
At this point, you'll probably encounter some merge conflicts. You must
resolve them in to preserve the patch from PR Update jinja2 requirement from <=3.1.4,>=3.1 to >=3.1,<=3.1.5 #6169 as close to the
original as possible.

Push this branch to your fork on GitHub:

$ git push origin patchback/backports/3.39/d2f2777d845c591e484b8f2bac72e036771860ff/pr-6169

Create a PR, ensure that the CI is green. If it's not — update it so that
the tests and any other checks pass. This is it!
Now relax and wait for the maintainers to process your pull request
when they have some cycles to do reviews. Don't worry — they'll tell you if
any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

patchback · 2025-01-08T14:14:55Z

Backport to 3.63: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply d2f2777 on top of patchback/backports/3.63/d2f2777d845c591e484b8f2bac72e036771860ff/pr-6169

Backporting merged PR #6169 into main

Ensure you have a local repo clone of your fork. Unless you cloned it
from the upstream, this would be your origin remote.
Make sure you have an upstream repo added as a remote too. In these
instructions you'll refer to it by the name upstream. If you don't
have it, here's how you can add it:
```
$ git remote add upstream https://github.com/pulp/pulpcore.git
```

Ensure you have the latest copy of upstream and prepare a branch
that will hold the backported code:

$ git fetch upstream
$ git checkout -b patchback/backports/3.63/d2f2777d845c591e484b8f2bac72e036771860ff/pr-6169 upstream/3.63

Now, cherry-pick PR Update jinja2 requirement from <=3.1.4,>=3.1 to >=3.1,<=3.1.5 #6169 contents into that branch:
```
$ git cherry-pick -x d2f2777d845c591e484b8f2bac72e036771860ff
```
If it'll yell at you with something like fatal: Commit d2f2777d845c591e484b8f2bac72e036771860ff is a merge but no -m option was given., add -m 1 as follows instead:
```
$ git cherry-pick -m1 -x d2f2777d845c591e484b8f2bac72e036771860ff
```
At this point, you'll probably encounter some merge conflicts. You must
resolve them in to preserve the patch from PR Update jinja2 requirement from <=3.1.4,>=3.1 to >=3.1,<=3.1.5 #6169 as close to the
original as possible.

Push this branch to your fork on GitHub:

$ git push origin patchback/backports/3.63/d2f2777d845c591e484b8f2bac72e036771860ff/pr-6169

Create a PR, ensure that the CI is green. If it's not — update it so that
the tests and any other checks pass. This is it!
Now relax and wait for the maintainers to process your pull request
when they have some cycles to do reviews. Don't worry — they'll tell you if
any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

patchback · 2025-01-08T14:14:55Z

Backport to 3.49: 💔 cherry-picking failed — conflicts found

❌ Failed to cleanly apply d2f2777 on top of patchback/backports/3.49/d2f2777d845c591e484b8f2bac72e036771860ff/pr-6169

Backporting merged PR #6169 into main

Ensure you have a local repo clone of your fork. Unless you cloned it
from the upstream, this would be your origin remote.
Make sure you have an upstream repo added as a remote too. In these
instructions you'll refer to it by the name upstream. If you don't
have it, here's how you can add it:
```
$ git remote add upstream https://github.com/pulp/pulpcore.git
```

Ensure you have the latest copy of upstream and prepare a branch
that will hold the backported code:

$ git fetch upstream
$ git checkout -b patchback/backports/3.49/d2f2777d845c591e484b8f2bac72e036771860ff/pr-6169 upstream/3.49

Now, cherry-pick PR Update jinja2 requirement from <=3.1.4,>=3.1 to >=3.1,<=3.1.5 #6169 contents into that branch:
```
$ git cherry-pick -x d2f2777d845c591e484b8f2bac72e036771860ff
```
If it'll yell at you with something like fatal: Commit d2f2777d845c591e484b8f2bac72e036771860ff is a merge but no -m option was given., add -m 1 as follows instead:
```
$ git cherry-pick -m1 -x d2f2777d845c591e484b8f2bac72e036771860ff
```
At this point, you'll probably encounter some merge conflicts. You must
resolve them in to preserve the patch from PR Update jinja2 requirement from <=3.1.4,>=3.1 to >=3.1,<=3.1.5 #6169 as close to the
original as possible.

Push this branch to your fork on GitHub:

$ git push origin patchback/backports/3.49/d2f2777d845c591e484b8f2bac72e036771860ff/pr-6169

Create a PR, ensure that the CI is green. If it's not — update it so that
the tests and any other checks pass. This is it!
Now relax and wait for the maintainers to process your pull request
when they have some cycles to do reviews. Don't worry — they'll tell you if
any improvements are necessary when the time comes!

🤖 @patchback
I'm built with octomachinery and
my source is open — https://github.com/sanitizers/patchback-github-app.

dependabot bot added the Dependencies Pull requests that update a dependency file label Dec 23, 2024

github-actions bot added no-changelog no-issue labels Dec 23, 2024

mdellweg enabled auto-merge (rebase) January 2, 2025 10:01

mdellweg approved these changes Jan 2, 2025

View reviewed changes

mdellweg merged commit d2f2777 into main Jan 2, 2025
12 checks passed

mdellweg deleted the dependabot/pip/jinja2-gte-3.1-and-lte-3.1.5 branch January 2, 2025 10:01

ggainey added backport-3.22 backport-3.39 backport-3.49 backport-3.63 labels Jan 8, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update jinja2 requirement from <=3.1.4,>=3.1 to >=3.1,<=3.1.5 #6169

Update jinja2 requirement from <=3.1.4,>=3.1 to >=3.1,<=3.1.5 #6169

dependabot bot commented on behalf of github Dec 23, 2024

patchback bot commented Jan 8, 2025 •

edited

Loading

patchback bot commented Jan 8, 2025 •

edited

Loading

patchback bot commented Jan 8, 2025 •

edited

Loading

patchback bot commented Jan 8, 2025 •

edited

Loading

Update jinja2 requirement from <=3.1.4,>=3.1 to >=3.1,<=3.1.5 #6169

Update jinja2 requirement from <=3.1.4,>=3.1 to >=3.1,<=3.1.5 #6169

Conversation

dependabot bot commented on behalf of github Dec 23, 2024

3.1.5

Version 3.1.5

patchback bot commented Jan 8, 2025 • edited Loading

Backport to 3.22: 💔 cherry-picking failed — conflicts found

Backporting merged PR #6169 into main

patchback bot commented Jan 8, 2025 • edited Loading

Backport to 3.39: 💔 cherry-picking failed — conflicts found

Backporting merged PR #6169 into main

patchback bot commented Jan 8, 2025 • edited Loading

Backport to 3.63: 💔 cherry-picking failed — conflicts found

Backporting merged PR #6169 into main

patchback bot commented Jan 8, 2025 • edited Loading

Backport to 3.49: 💔 cherry-picking failed — conflicts found

Backporting merged PR #6169 into main

patchback bot commented Jan 8, 2025 •

edited

Loading

patchback bot commented Jan 8, 2025 •

edited

Loading

patchback bot commented Jan 8, 2025 •

edited

Loading

patchback bot commented Jan 8, 2025 •

edited

Loading