Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

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

Merged
merged 1 commit into from
Jan 8, 2025

Conversation

ggainey
Copy link
Contributor

@ggainey ggainey commented Jan 8, 2025

Updates the requirements on jinja2 to permit the latest version.


updated-dependencies:

  • dependency-name: jinja2 dependency-type: direct:production ...

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
...
@mdellweg mdellweg enabled auto-merge (rebase) January 8, 2025 15:19
@mdellweg mdellweg merged commit ede2a44 into pulp:3.63 Jan 8, 2025
12 checks passed
Copy link

patchback bot commented Jan 8, 2025

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

❌ Failed to cleanly apply ede2a44 on top of patchback/backports/3.22/ede2a442c306dfa1219ac20268a32bc0a759c913/pr-6179

Backporting merged PR #6179 into 3.63

  1. Ensure you have a local repo clone of your fork. Unless you cloned it
    from the upstream, this would be your origin remote.
  2. 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
  3. 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/ede2a442c306dfa1219ac20268a32bc0a759c913/pr-6179 upstream/3.22
  4. Now, cherry-pick PR Update jinja2 requirement from <=3.1.4,>=3.1 to >=3.1,<=3.1.5 #6179 contents into that branch:
    $ git cherry-pick -x ede2a442c306dfa1219ac20268a32bc0a759c913
    If it'll yell at you with something like fatal: Commit ede2a442c306dfa1219ac20268a32bc0a759c913 is a merge but no -m option was given., add -m 1 as follows instead:
    $ git cherry-pick -m1 -x ede2a442c306dfa1219ac20268a32bc0a759c913
  5. 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 #6179 as close to the
    original as possible.
  6. Push this branch to your fork on GitHub:
    $ git push origin patchback/backports/3.22/ede2a442c306dfa1219ac20268a32bc0a759c913/pr-6179
  7. 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.

Copy link

patchback bot commented Jan 8, 2025

Backport to 3.39: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.39/ede2a442c306dfa1219ac20268a32bc0a759c913/pr-6179

Backported as #6180

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

Copy link

patchback bot commented Jan 8, 2025

Backport to 3.49: 💚 backport PR created

✅ Backport PR branch: patchback/backports/3.49/ede2a442c306dfa1219ac20268a32bc0a759c913/pr-6179

Backported as #6181

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants