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

gh-122085: Use include files for whatsnew/3.13.rst deprecations #121241

Merged
merged 3 commits into from
Jul 19, 2024

Conversation

hugovk
Copy link
Member

@hugovk hugovk commented Jul 1, 2024

Re: https://discuss.python.org/t/streamline-whats-new-by-moving-deprecations-and-removals-out-of-news/53997/8

This moves these sections out of "What's New in Python 3.13" into include files:

  • "Pending Removal in Python 3.14"
  • "Pending Removal in Python 3.15"
  • "Pending Removal in Future Versions"

Later PRs will add includes to other What's New files, to avoid needing to duplicate and sync these sections between files. And we can later also create a dedicated page to list deprecations.


📚 Documentation preview 📚: https://cpython-previews--121241.org.readthedocs.build/

@nineteendo
Copy link
Contributor

nineteendo commented Jul 1, 2024

What happens if an entry from "Pending Removal in Future Versions" moves to "Pending Removal in Python 3.16"?
Would it be beneficial to include blank Doc/deprecations/pending-removal-in-3.*.rst up to when 3.13 will reach EOL (3.18)?

@hugovk
Copy link
Member Author

hugovk commented Jul 1, 2024

Then we move it from ../deprecations/pending-removal-in-future.rst into a .. include:: ../deprecations/pending-removal-in-3.16.rst.

@nineteendo
Copy link
Contributor

nineteendo commented Jul 1, 2024

Yes, but then it wouldn't show up in the list of future deprecations for 3.13 if 3.16 isn't included (which would be easy to forget when added).

@hugovk
Copy link
Member Author

hugovk commented Jul 1, 2024

Correct, when creating a new include file, you need to remember to add it to the relevant pages.

@encukou
Copy link
Member

encukou commented Jul 2, 2024

This only covers the C API, not the Python API. Is that intended?

@hugovk
Copy link
Member Author

hugovk commented Jul 2, 2024

TODO: This was meant to be for the Python deprecations, not C API ones. I'll update it.

@nineteendo
Copy link
Contributor

nineteendo commented Jul 2, 2024

What will we do with the C API? Do we include it like this? Or do we put it in a separate file?

.. include::  ../deprecations/pending-removal-in-3.14.rst
    :start-after: .. start_pending_removal_in_3_14_capi
    :end-before: .. end_pending_removal_in_3_14_capi

@hugovk
Copy link
Member Author

hugovk commented Jul 2, 2024

No, I think it would be easier to have each in their own files (not necessarily named like this):

deprecations/pending-removal-in-3.14.rst
deprecations/pending-removal-in-3.14_capi.rst

@hugovk hugovk marked this pull request as draft July 2, 2024 19:58
@hugovk hugovk force-pushed the docs-include-deprecations branch from 8a461c5 to 2e85df9 Compare July 5, 2024 20:20
@hugovk
Copy link
Member Author

hugovk commented Jul 5, 2024

TODO: This was meant to be for the Python deprecations, not C API ones. I'll update it.

Updated.

@hugovk hugovk marked this pull request as ready for review July 5, 2024 20:25
Copy link
Member

@encukou encukou left a comment

Choose a reason for hiding this comment

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

Looks good to me, with one typo fix!

Doc/deprecations/pending-removal-in-future.rst Outdated Show resolved Hide resolved
@@ -1631,318 +1631,13 @@ New Deprecations

.. Add deprecations above alphabetically, not here at the end.

Copy link
Member

Choose a reason for hiding this comment

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

Would it make sense to add a new "Pending removal" section, with a paragraph describing what "pending removal" means, and include the other files as subsections?

These are currently nested under "New Deprecation" (not sure if intentionally):
image

I also noticed that there are two "Pending Removal in Python 3.x", for each "x", e.g.:

Is this intentional?

Copy link
Member

@encukou encukou Jul 19, 2024

Choose a reason for hiding this comment

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

I suggest not expanding the scope of the PR. Move the content in this one, rearrange the page later (and possibly only for 3.14).

I also noticed that there are two "Pending Removal in Python 3.x", for each "x", e.g.:

Yes, there are separate sections for Python API and C API, and they're not presented very clearly.

Copy link
Member

Choose a reason for hiding this comment

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

FWIW, I followed up on this in the original issue:

@hugovk hugovk merged commit a1df1b4 into python:main Jul 19, 2024
24 checks passed
@hugovk hugovk deleted the docs-include-deprecations branch July 19, 2024 13:57
@miss-islington-app
Copy link

Thanks @hugovk for the PR 🌮🎉.. I'm working now to backport this PR to: 3.13.
🐍🍒⛏🤖

@miss-islington-app
Copy link

Sorry, @hugovk, I could not cleanly backport this to 3.13 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker a1df1b44394784721239615f307b273455536d14 3.13

hugovk added a commit to hugovk/cpython that referenced this pull request Jul 19, 2024
(cherry picked from commit a1df1b4)

Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
@bedevere-app
Copy link

bedevere-app bot commented Jul 19, 2024

GH-122038 is a backport of this pull request to the 3.13 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.13 bugs and security fixes label Jul 19, 2024
@hugovk hugovk changed the title Docs: move deprecations into include files Docs: move deprecations from 3.13.rst into include files Jul 21, 2024
@hugovk hugovk changed the title Docs: move deprecations from 3.13.rst into include files gh-122085: Docs: move deprecations from 3.13.rst into include files Jul 21, 2024
@hugovk hugovk changed the title gh-122085: Docs: move deprecations from 3.13.rst into include files gh-122085: Use include files for whatsnew/3.13.rst deprecations Jul 21, 2024
@hugovk
Copy link
Member Author

hugovk commented Jul 22, 2024

I've opened #122085 as a tracking issue, and #122093 is the next PR.

@bedevere-app
Copy link

bedevere-app bot commented Jul 24, 2024

GH-122038 is a backport of this pull request to the 3.13 branch.

1 similar comment
@bedevere-app
Copy link

bedevere-app bot commented Jul 24, 2024

GH-122038 is a backport of this pull request to the 3.13 branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
docs Documentation in the Doc dir skip issue skip news
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants