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.

Sign up for GitHub

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

Jump to bottom

GH-101986: Support translation for Limited/Unstable API & Stable ABI #107680

Merged
merged 3 commits into from
Dec 10, 2023
Merged

GH-101986: Support translation for Limited/Unstable API & Stable ABI #107680

merged 3 commits into from
Dec 10, 2023

Conversation

AA-Turner
Copy link
Member

@AA-Turner AA-Turner commented Aug 6, 2023 •
edited by github-actions bot
Loading

@bedevere-bot bedevere-bot mentioned this pull request Aug 6, 2023
Closed
@AA-Turner AA-Turner added skip news needs backport to 3.11 only security fixes needs backport to 3.12 bug and security fixes docs Documentation in the Doc dir labels Aug 6, 2023
ezio-melotti
ezio-melotti approved these changes Aug 16, 2023
View reviewed changes
Doc/tools/extensions/c_annotations.py Outdated Show resolved Hide resolved
@AA-Turner @ezio-melotti
Update Doc/tools/extensions/c_annotations.py
839ac93 
Co-authored-by: Ezio Melotti <ezio.melotti@gmail.com>
@hugovk
Copy link
Member

hugovk commented Sep 6, 2023

@Yhg1s Would you rather wait until 3.12.1 for this?

If so, shall we also hold off merging it to main and 3.11 until then?

@hugovk
Copy link
Member

hugovk commented Oct 18, 2023

3.12.1 will be the next release, we're good to merge this now.

@AA-Turner Would you like to use your new powers to click the big green button? :)

@hugovk
Copy link
Member

hugovk commented Dec 10, 2023

Let's not wait any longer. Thanks for the PR!

@hugovk hugovk merged commit 9cdf05b into python:main Dec 10, 2023
23 checks passed
@miss-islington-app
Copy link

Thanks @AA-Turner for the PR, and @hugovk for merging it 🌮🎉.. I'm working now to backport this PR to: 3.11, 3.12.
🐍🍒⛏🤖

miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Dec 10, 2023
@AA-Turner @ezio-melotti
@hugovk @miss-islington
pythonGH-101986: Support translation for Limited/Unstable API & Stabl…
acff91a 
…e ABI (pythonGH-107680)

(cherry picked from commit 9cdf05b)

Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>
Co-authored-by: Ezio Melotti <ezio.melotti@gmail.com>
Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
@bedevere-app
Copy link

bedevere-app bot commented Dec 10, 2023

GH-112940 is a backport of this pull request to the 3.12 branch.

@miss-islington-app
Copy link

Sorry, @AA-Turner and @hugovk, I could not cleanly backport this to 3.11 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker 9cdf05bc28c5cd8b000b9541a907028819b3d63e 3.11

@bedevere-app bedevere-app bot removed the needs backport to 3.12 bug and security fixes label Dec 10, 2023
@bedevere-app
Copy link

bedevere-app bot commented Dec 10, 2023

GH-112941 is a backport of this pull request to the 3.11 branch.

@bedevere-app bedevere-app bot removed the needs backport to 3.11 only security fixes label Dec 10, 2023
hugovk added a commit to hugovk/cpython that referenced this pull request Dec 10, 2023
@AA-Turner @ezio-melotti @hugovk
[3.11] pythonGH-101986: Support translation for Limited/Unstable API …
41b20af 
…& Stable ABI (pythonGH-107680)

(cherry picked from commit 9cdf05b)

Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>
Co-authored-by: Ezio Melotti <ezio.melotti@gmail.com>
Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
hugovk added a commit that referenced this pull request Dec 10, 2023
@miss-islington @AA-Turner
@ezio-melotti @hugovk
[3.12] GH-101986: Support translation for Limited/Unstable API & Stab…
78a5010 
…le ABI (GH-107680) (#112940)

Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>
Co-authored-by: Ezio Melotti <ezio.melotti@gmail.com>
Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
hugovk added a commit that referenced this pull request Dec 10, 2023
@hugovk @AA-Turner @ezio-melotti
[3.11] GH-101986: Support translation for Limited/Unstable API & Stab…
2f26683 
…le ABI (GH-107680) (#112941)

Co-authored-by: Adam Turner <9087854+AA-Turner@users.noreply.github.com>
Co-authored-by: Ezio Melotti <ezio.melotti@gmail.com>
egeakman
egeakman reviewed Jan 1, 2024
View reviewed changes
Doc/tools/templates/dummy.html
@@ -9,6 +9,16 @@

In extensions/c_annotations.py:

{% trans %} Part of the {% endtrans %}
Copy link
Contributor

@egeakman egeakman Jan 1, 2024 •
edited
Loading

Choose a reason for hiding this comment

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

@AA-Turner sphinx-lint complains about the trailing whitespaces here and here, and if I remove these whitespace in the translation (po file), the HTML ends up like this: (no spaces in-between)

image

image

image

and so on

Could we remove these trailing whitespaces here, and insert them at the beginning of Limited API and Stable ABI?

We can remove all the whitespaces (leading and trailing) in the template file and modify c_annotations.py to handle the spacing.

egeakman added a commit to python/python-docs-tr that referenced this pull request Jan 1, 2024
@egeakman
Flag some entries as fuzzy until python/cpython#107680 (comment) is r…
6b34e70 
…esolved.

Remove pip caching
This was referenced Jan 2, 2024
Closed
Merged
aisk pushed a commit to aisk/cpython that referenced this pull request Feb 11, 2024
@AA-Turner @ezio-melotti
@hugovk @aisk
pythonGH-101986: Support translation for Limited/Unstable API & Stabl…
b41d34a 
…e ABI (python#107680)

Co-authored-by: Ezio Melotti <ezio.melotti@gmail.com>
Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
Glyphack pushed a commit to Glyphack/cpython that referenced this pull request Sep 2, 2024
@AA-Turner @ezio-melotti
@hugovk @Glyphack
pythonGH-101986: Support translation for Limited/Unstable API & Stabl…
718542a 
…e ABI (python#107680)

Co-authored-by: Ezio Melotti <ezio.melotti@gmail.com>
Co-authored-by: Hugo van Kemenade <hugovk@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@egeakman egeakman egeakman left review comments

@ezio-melotti ezio-melotti ezio-melotti approved these changes

@hugovk hugovk hugovk approved these changes

@JulienPalard JulienPalard Awaiting requested review from JulienPalard

Assignees

@hugovk hugovk

Labels
docs Documentation in the Doc dir skip news
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@AA-Turner @hugovk @ezio-melotti @egeakman @bedevere-bot