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 to 3.0.* #4877

Merged
merged 2 commits into from
Jun 1, 2022
Merged

Update Jinja2 to 3.0.* #4877

merged 2 commits into from
Jun 1, 2022

Conversation

MetRonnie
Copy link
Member

@MetRonnie MetRonnie commented May 16, 2022

These changes close #4702

Update Jinja2 from 2.11 to 3.0

Requirements check-list

  • I have read CONTRIBUTING.md and added my name as a Code Contributor.
  • Contains logically grouped changes (else tidy your branch by rebase).
  • Does not contain off-topic changes (use other PRs for other changes).
  • Applied any dependency changes to both setup.cfg and conda-environment.yml.
  • Does not need tests (tested manually against many existing Cylc 7 source suites).
  • Appropriate change log entry included.
  • (master branch) I have opened a documentation PR: Add note on Jinja2 zero-padded integers cylc-doc#467

@MetRonnie MetRonnie added this to the cylc-8.0rc4 milestone May 16, 2022
@MetRonnie MetRonnie self-assigned this May 16, 2022
@MetRonnie MetRonnie marked this pull request as draft May 16, 2022 16:08
@MetRonnie
Copy link
Member Author

Do we want to include a complex jinja2 workflow example that we diff against a reference file, as a functional test?

@oliver-sanders
Copy link
Member

Do we want to include a complex jinja2 workflow example that we diff against a reference file, as a functional test?

I don't think so and we wouldn't be able to capture all uses and patterns. Hopefully future upgrades won't be so complicated. The timing of this one with Cylc 8 and the need for 7/8 interoperability has made this tricky.

@MetRonnie MetRonnie marked this pull request as ready for review May 19, 2022 12:54
Comment on lines -22 to -25
# https://github.com/pallets/jinja/issues/1585 (remove when upgrading
# jinja2 to >= 3.0):
- markupsafe <2.1

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note to self: remember to remove this in the conda-feedstock.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Copy link
Member

@oliver-sanders oliver-sanders left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM but haven't manually tested.

@MetRonnie
Copy link
Member Author

functional tests / macos failed due to Codecov upload failure only

@hjoliver hjoliver merged commit 3a9fb46 into cylc:master Jun 1, 2022
@MetRonnie MetRonnie deleted the jinja2-3 branch June 1, 2022 09:01
@hjoliver hjoliver modified the milestones: cylc-8.0rc4, cylc-8.0.0 Jul 5, 2022
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.

jinja2: move to version 3
3 participants