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

Doc/whatsnew/3.{9,10,11}.rst are out of sync on various branches #100734

Closed
zware opened this issue Jan 3, 2023 · 4 comments · Fixed by #114689
Closed

Doc/whatsnew/3.{9,10,11}.rst are out of sync on various branches #100734

zware opened this issue Jan 3, 2023 · 4 comments · Fixed by #114689
Labels
3.10 only security fixes 3.11 only security fixes 3.12 bugs and security fixes docs Documentation in the Doc dir

Comments

@zware
Copy link
Member

zware commented Jan 3, 2023

Documentation

There are various inconsistencies between the whatsnew documents for 3.9, 3.10, and 3.11 on the 3.9, 3.10, 3.11, and main branches. Most of the inconsistencies are trivial, but some will require some research to determine which version is the canonical text that should be synced across branches.

Linked PRs

@zware zware added docs Documentation in the Doc dir 3.11 only security fixes 3.10 only security fixes 3.12 bugs and security fixes labels Jan 3, 2023
@ned-deily
Copy link
Member

ned-deily commented Jan 3, 2023

This is an on-going problem due to the unnecessary duplication of data across release branches; it is also an issue with the generated changelog.html files for each branch. Rather than trying to patch over the problem again, we should fix it permanently by removing the duplication. One way that I believe would work is to change the whatsnew and changelog "templates" for each release branch to only contain the data for its branch and to include links at the bottom to the on-line version of the previous branch's whatsnew or changelog. There would also likely need to be some release manager actions added to PEP 101 and release scripts to delete the previous branch's whatsnew when creating a new release branch, i.e. at beta 1 time. One minor downside to this is that any off-line version of the docs would now have a link to the on-line whatsnew and changelog for previous releases rather than a fully self-contained off-line version but that's probably better than having incomplete and/or incorrect information as we do today. @python/python-release-managers

@hugovk
Copy link
Member

hugovk commented Jan 9, 2023

See also python/docsbuild-scripts#138.

@JelleZijlstra
Copy link
Member

If I understand @ned-deily correctly, his proposal would be that the main branch contain only the 3.12 What's New, the 3.11 branch only the 3.11 What's New, etc.

One problem with that approach is that we fairly regularly have PRs updating an old branch's What's New in addition to docs changes (e.g. #100009, #100179. Currently, such PRs can be made against main, then backported into 3.11. But with Ned's proposal, that won't work any more, and you might need a separate PR against the 3.11 branch.

@ned-deily
Copy link
Member

While I think it would be best to really have one and only one copy of each branch's What's New, I suppose we could come up with some kludge to ease merging like not removing the old branches's whatsnew file in the newer branches but have the old files removed when producing each release's source files (tarballs, et al) while still using the suggested links in the generated html files. OTOH, I don't think that this comes up that often that it is an undue burden. But that's just my opinion.

hugovk added a commit that referenced this issue Jan 28, 2024
…4657)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
miss-islington pushed a commit to miss-islington/cpython that referenced this issue Jan 28, 2024
pythonGH-114657)

(cherry picked from commit 3bb6912)

Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
hugovk added a commit that referenced this issue Jan 28, 2024
…t` (GH-114657) (#114688)

Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
aisk pushed a commit to aisk/cpython that referenced this issue Feb 11, 2024
python#114657)

Co-authored-by: Serhiy Storchaka <storchaka@gmail.com>
miss-islington pushed a commit to miss-islington/cpython that referenced this issue Feb 15, 2024
pythonGH-114689)

(cherry picked from commit cfb2640)

Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
hugovk added a commit to hugovk/cpython that referenced this issue Feb 15, 2024
…x branch (pythonGH-114689).

(cherry picked from commit cfb2640)

Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
hugovk added a commit that referenced this issue Feb 15, 2024
…ch (GH-114689) (#115526)

Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3.10 only security fixes 3.11 only security fixes 3.12 bugs and security fixes docs Documentation in the Doc dir
Projects
None yet
Development

Successfully merging a pull request may close this issue.

5 participants
@JelleZijlstra @hugovk @ned-deily @zware and others