8000 [3.7] bpo-47138: Fix documentation build by pinning Jinja version to 3.0.3 by m-aciek · Pull Request #32111 · python/cpython · GitHub
[go: up one dir, main page]

Skip to content

[3.7] bpo-47138: Fix documentation build by pinning Jinja version to 3.0.3 #32111

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

Merged
merged 2 commits into from
Mar 28, 2022

Conversation

m-aciek
Copy link
Contributor
@m-aciek m-aciek commented Mar 25, 2022

@Mariatta Mariatta closed this Mar 25, 2022
@Mariatta Mariatta reopened this Mar 25, 2022
@ned-deily ned-deily self-assigned this Mar 25, 2022
@Mariatta Mariatta changed the title bpo-45618: Fix documentation build by pinning Jinja version to 3.0.3 [3.7] bpo-45618: Fix documentation build by pinning Jinja version to 3.0.3 Mar 25, 2022
@ned-deily
Copy link
Member

See my comments on the bug issue.

Copy link
Member
@hugovk hugovk left a comment

Choose a reason for hiding this comment

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

This PR looks good, it only adds a jinja2 pin and doesn't modify the others.

The doc-html preview downloadable at https://github.com/python/cpython/actions/runs/2041354404 looks good too.


Should we use this new bpo number? https://bugs.python.org/issue47138

@m-aciek m-aciek changed the title [3.7] bpo-45618: Fix documentation build by pinning Jinja version to 3.0.3 [3.7] bpo-47138: Fix documentation build by pinning Jinja version to 3.0.3 Mar 28, 2022
@m-aciek
Copy link
Contributor Author
m-aciek commented Mar 28, 2022

I've updated the commit message with a new ticket number.

@hugovk hugovk removed the skip news label Mar 28, 2022
@ned-deily
Copy link
Member
ned-deily commented Mar 28, 2022

@hugovk and @m-aciek, thanks! @m-aciek, perhaps an unnecessary warning but, before doing git pulls on your local repo, you probably will want to do a git reset on your 3.7 and 3.8 branches to remove the commits associated with this and your 3.8 PR as the commits get squashed when merging upstream and so will create an unnecessary merge in your local repo. That's why it's always best to use a unique branch name when creating a PR (like git checkout -b [bpo-47138](https://bugs.python.org/issue47138)-3.7)

@m-aciek
Copy link
Contributor Author
m-aciek commented Mar 28, 2022

Yes, I'm sorry for the branch name, it probably made it harder to work with it locally. I used to use git pull --rebase, which should avoid the problem, but thank you for the hint nevertheless. And thank you for the cooperation on the fix!

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.

5 participants
0