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

Remove outdated workaround for a bug in black formatter #6045

Merged
merged 2 commits into from Mar 21, 2023
Merged

Remove outdated workaround for a bug in black formatter #6045

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ca2f9cd
Remove outdated workaround for a bug in black formatter
pavoljuhas Mar 21, 2023
155df0a
Merge branch 'master' into clean-redundant-black-workaround
pavoljuhas Mar 21, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
10 changes: 1 addition & 9 deletions check/format-incremental
View file
Open in desktop
Expand Up @@ -112,16 +112,8 @@ if (( only_print == 1 )); then
args+=("--check" "--diff")
fi

# Warn users about bug in black: https://github.com/psf/black/issues/1629
# Once that is fixed upstream, we can just do:
# black "${args[@]}" "${format_files[@]}"
# exit $?
LOGS="$(black "${args[@]}" "${format_files[@]}" 2>&1)"
black "${args[@]}" "${format_files[@]}"
Copy link
Collaborator

Choose a reason for hiding this comment

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

Do we need to re-run the formatter on all files?

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

Do we need to re-run the formatter on all files?

No, the previous version would still exit with error if black failed.
The removed code was only showing a message about the bug in black.

BLACKSTATUS=$?
echo "${LOGS}"
if [[ "$BLACKSTATUS" == "123" && "$LOGS" =~ ^.*"INTERNAL ERROR: Black produced different code on the second pass of the formatter.".*$ ]]; then
echo -e "\033[31mWarning, it seems we ran into https://github.com/psf/black/issues/1629. Typically, this can be fixed by adding a trailing comma. If you get stuck, please file a cirq issue on github.\033[0m"
fi

if [[ "$FLYNTSTATUS" != "0" || "$BLACKSTATUS" != "0" ]]; then
exit 1
Expand Down