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.

Sign up for GitHub

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
58f561a
Update Jinja2 to 3.0.*
MetRonnie May 3, 2022
de96e18
Update changelog
MetRonnie May 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions CHANGES.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,9 @@ Fourth Release Candidate for Cylc 8 suitable for acceptance testing.

### Enhancements

[#4877](https://github.com/cylc/cylc-flow/pull/4877) - Upgrade the version of
Jinja2 used by Cylc from 2.11 to 3.0.

[#4896](https://github.com/cylc/cylc-flow/pull/4896) - Allow the setting of
default job runner directives for platforms.

Expand Down
7 changes: 2 additions & 5 deletions conda-environment.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,8 @@ dependencies:
- colorama >=0.4,<1.0
- graphene >=2.1,<3
- graphviz # for static graphing
- jinja2 ==2.11.0,<2.12
# Note: can't pin jinja2 any higher than this until we give up on Cylc 7 back-compat
- jinja2 >=3.0,<3.1
- metomi-isodatetime >=1!3.0.0, <1!3.1.0
# Constrain protobuf version for compatible Scheduler-UIS comms across hosts
- protobuf >=3.19.0,<3.20.0
Expand All @@ -19,10 +20,6 @@ dependencies:
- setuptools >=49
- urwid >=2,<3

# https://github.com/pallets/jinja/issues/1585 (remove when upgrading
# jinja2 to >= 3.0):
- markupsafe <2.1

Comment on lines -22 to -25
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.

conda-forge/cylc-flow-feedstock#42

# optional dependencies
#- empy >=3.3,<3.4
#- pandas >=1.0,<2
Expand Down
7 changes: 2 additions & 5 deletions setup.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@ install_requires =
async-timeout>=3.0.0
colorama>=0.4,<=1
graphene>=2.1,<3
jinja2==2.11.*
# Note: can't pin jinja2 any higher than this until we give up on Cylc 7 back-compat
jinja2==3.0.*
metomi-isodatetime==1!3.0.*
# Constrain protobuf version for compatible Scheduler-UIS comms across hosts
protobuf==3.19.*
Expand All @@ -77,10 +78,6 @@ install_requires =
rx
promise

# https://github.com/pallets/jinja/issues/1585 (remove when upgrading
# jinja2 to >= 3.0):
markupsafe<2.1

[options.packages.find]
include = cylc*

Expand Down