Skip to content

make merge #1300

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
Merged
merged 3 commits into from
May 24, 2020
Merged

make merge #1300

merged 3 commits into from
May 24, 2020

Conversation

JulienPalard
Copy link
Member

Je n'ai pas touché au fuzzy, juste fait un make merge.

@JulienPalard JulienPalard mentioned this pull request May 23, 2020
Closed
@deronnax
Copy link
Collaborator

Qui êtes vous, monsieur ? Comment avez-vous eu accès au dépôt ?

awecx
awecx reviewed May 23, 2020
View reviewed changes
library/functions.po
Comment on lines +1561 to +1562
"Lève un :ref:`auditing event <auditing>` ``builtins.breakpoint`` avec "
"l'argument ``breakpointhook``."
Copy link

Choose a reason for hiding this comment

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

Suggested change
"Lève un :ref:`auditing event <auditing>` ``builtins.breakpoint`` avec "
"l'argument ``breakpointhook``."
"Lève un :ref:`évènement d'audit <auditing>` ``builtins.input/result` avec "
"l'argument ``result``."

Copy link
Collaborator

Choose a reason for hiding this comment

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

c'est pas lui qui casse la CI, hein

Copy link

Choose a reason for hiding this comment

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

Exact, j'ai lu trop vite.

@awecx
Copy link

awecx commented May 23, 2020

library/idle.po:1712:appellant
library/sys.po:558:breakpointhook

D'où ça vient ça ?

@deronnax @awecx
Update library/idle.po
65d11ab 
Co-authored-by: Antoine <43954001+awecx@users.noreply.github.com>
deronnax
deronnax reviewed May 24, 2020
View reviewed changes
library/sys.po Outdated
#: ../Doc/library/sys.rst:346
#, fuzzy
msgid "__unraisablehook__"
msgstr "__breakpointhook__"
Copy link
Collaborator

Choose a reason for hiding this comment

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

c'est lui. Et alors c'est très bizarre parce que son pote juste au-dessus ___breakpointhook__ lui semble passer le pospell.

Copy link
Member Author

Choose a reason for hiding this comment

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

Celui juste au dessus passe car pospell ignore quand msgid == msgstr.

@JulienPalard
Copy link
Member Author

library/idle.po:1712:appellant
library/sys.po:558:breakpointhook

D'où ça vient ça ?

$ git blame library/idle.po | grep appellant
1bf9a2fa0 (fsetton              2020-05-23 10:01:36 +0200 1716) "Lorsque l'utilisateur lève `SystemExit` directement ou en appellant ``sys."

et le fuzzy library/sys.po:558:breakpointhook ça vient du make merge, c'est sphinx-build -b gettext qui se permet de rajouter qq fuzzy au cas où ça aide.

@JulienPalard
Copy link
Member Author

Intéressant pospell qui bloque sur dunder breakpointhook :(

@JulienPalard
Copy link
Member Author

Je tente avec des double backticks.

@deronnax
Copy link
Collaborator

deronnax commented May 24, 2020 •
edited
Loading

Autre truc intriguant : la PR qui a introduit l'erreur (la #1175) est bien verte, la CI lui a donné le go, malgré le "appellant" invalide. Ça signifie qu'il y a un problème avec la CI (soit la détection du Makefile des fichier à analyser, soit pospell)

@JulienPalard
Copy link
Member Author

JulienPalard commented May 24, 2020 •
edited
Loading

Louche, je la voit bien rouge sur travis : https://travis-ci.org/github/python/python-docs-fr/builds/690293347 :

$ if [ -n "$CHANGED_FILES" ]; then pospell -p dict -l fr_FR $CHANGED_FILES; fi

library/idle.po:1705:appellant

The command "if [ -n "$CHANGED_FILES" ]; then pospell -p dict -l fr_FR $CHANGED_FILES; fi" exited with 255.

@JulienPalard JulienPalard merged commit 00a0972 into python:3.8 May 24, 2020
@deronnax
Copy link
Collaborator

Le commit de merge est rouge mais pas la PR. Je ne comprends pas comment cela peut être possible.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@awecx awecx awecx left review comments

@deronnax deronnax deronnax approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@JulienPalard @deronnax @awecx