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

Upgrade Jinja2 to v3.1.3 #4613

Merged
merged 1 commit into from
Jan 17, 2024
Merged

Upgrade Jinja2 to v3.1.3 #4613

merged 1 commit into from
Jan 17, 2024

Conversation

benjsmi
Copy link
Contributor

@benjsmi benjsmi commented Jan 17, 2024

This is for the main branch.

The version of Sphinx we were using is simply not compatible with Jinja2 > v3.0.3, so given that we had to upset the delicate balance of requirements anyway, the goal of this PR is now to bring all docs infrastructure for CI/CD as well as dependencies and indeed the docs themselves to the latest version.

Type of change

  • Documentation update

Description

Motivation is https://nvd.nist.gov/vuln/detail/CVE-2024-22195, quite simply. But the version of Sphinx that we were using was many years old and does not support a version of Jinja higher than v3.0.3. So we need to update the entire set of dependencies for the documentation.

Additional details

I will make whatever changes are needed to the docs and/or to the CI/CD pipeline to make this compatible with Sphinx v7.2.6, which is the latest. Please let me know if something isn't right or needs fixing, because this is the time to do it.

Related issues

Release Note

This change does NOT impact users of Fabric, nor shall it impact the functionality of any release, past, future, present. We are also unlikely to merge it until the docs look correct on RTD. But be advised that they may indeed change.

The version of Sphinx we were using is simply not compatible
with Jinja2 > v3.0.3, so given that we had to upset the delicate
balance of requirements anyway, the goal of this PR is now to
bring all docs infrastructure for CI/CD as well as dependencies
and indeed the docs themselves to the latest version.

Signed-off-by: Ben Smith <[email protected]>
@benjsmi benjsmi requested review from a team as code owners January 17, 2024 18:38
@denyeart
Copy link
Contributor

Detailed review complete!

@denyeart denyeart merged commit 145815c into hyperledger:main Jan 17, 2024
14 checks passed
@denyeart
Copy link
Contributor

@Mergifyio backport release-2.5

Copy link

mergify bot commented Jan 17, 2024

backport release-2.5

✅ Backports have been created

@denyeart
Copy link
Contributor

@benjsmi The automated backport to release-2.5 failed due to merge conflicts. Do you want to create a release-2.5 PR manually?

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

Successfully merging this pull request may close these issues.

2 participants