[3.9] gh-121277: Allow .. versionadded:: next in docs (GH-121278) - #128117
Merged
ambv merged 2 commits intoJan 23, 2025
Merged
Conversation
Copy link
Copy Markdown
Member
Sorry, something went wrong.
…-121278) (pythonGH-127867) Make `versionchanged:: next`` expand to current (unreleased) version. When a new CPython release is cut, the release manager will replace all such occurences of "next" with the just-released version. (See the issue for release-tools and devguide PRs.) Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com> Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com> (cherry picked from commit 7d24ea9) pythongh-121277: Raise nice error on `next` as second argument to deprecated-removed (pythonGH-124623) (cherry-picked from e349f73) Updates for 3.9 (cherry-picked from 3.11: f0895aa) (cherry-picked from 3.10: 8773554) * Use version, not arguments directly
6 tasks
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Make `versionchanged:: next`` expand to current (unreleased) version.
When a new CPython release is cut, the release manager will replace all such occurences of "next" with the just-released version. (See the issue for release-tools and devguide PRs.)
This is not a security fix, but an internal feature meant to make backporting easier. Pablo allowed it in 3.10-3.11 though. @ambv, do you want it in 3.9?
Tested on Sphinx 2.4 & 4.5 with a local change (like in GH-127827).
(On Sphinx 5 the build fails for an unrelated reason: #98366.)
Co-authored-by: Adam Turner 9087854+AA-Turner@users.noreply.github.com
Co-authored-by: Hugo van Kemenade 1324225+hugovk@users.noreply.github.com
(cherry picked from commit 7d24ea9)
gh-121277: Raise nice error on next as second argument to deprecated-removed (GH-124623)
(cherry-picked from e349f73)
Updates for 3.9: avoid the new sphinx_gettext
(cherry-picked from 3.10: 8773554)