Skip to content

[3924] Fix merging implicit multiline strings that have inline comments #3956

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 7 commits into from
Oct 20, 2023
Merged

[3924] Fix merging implicit multiline strings that have inline comments #3956

merged 7 commits into from
Oct 20, 2023

Conversation

henriholopainen
Copy link
Contributor

@henriholopainen henriholopainen commented Oct 19, 2023 •
edited
Loading

Description

After some discussions in the issue, we decided not to merge implicit multiline strings if there are inline comments on the string lines. Added description of behaviour to Preview style documentation.

Checklist - did you ...

  • Add an entry in CHANGES.md if necessary?
  • Add / update tests if necessary?
  • Add new / update outdated documentation?

@henriholopainen henriholopainen changed the title Issue 3924 [3924] Fix merging implicit multiline strings that have inline comments Oct 19, 2023
@henriholopainen henriholopainen mentioned this pull request Oct 19, 2023
Closed
@github-actions
Copy link

diff-shades results comparing this PR (74d46c8) to main (9edba85). The full diff is available in the logs under the "Generate HTML diff report" step.

╭─────────────────────── Summary ────────────────────────╮
│ 1 projects & 1 files changed / 4 changes [+2/-2]       │
│                                                        │
│ ... out of 2 498 892 lines, 11 747 files & 23 projects │
╰────────────────────────────────────────────────────────╯

Differences found.

What is this? | Workflow run | diff-shades documentation

@henriholopainen
Copy link
Contributor Author

The documentation build error looks like it's not rooted in these changes:

Configuration error:
There is a programmable error in your configuration file:

-------

pkg_resources.DistributionNotFound: The 'black' distribution was not found and is required by the application

Will look into the diff-shades

@henriholopainen
Copy link
Contributor Author

henriholopainen commented Oct 19, 2023 •
edited
Loading

Hmm, can't reproduce the diff-shades locally:

% black --version
black, 0.1.dev1687+g9edba85.d20231019 (compiled: no)
Python (CPython) 3.11.3
% black --diff ../django/tests/admin_scripts/tests.py
All done! ✨ 🍰 ✨
1 file would be left unchanged.

% black --version
black, 0.1.dev1694+g74d46c8.d20231019 (compiled: no)
Python (CPython) 3.11.3
% black --diff ../django/tests/admin_scripts/tests.py
All done! ✨ 🍰 ✨
1 file would be left unchanged.

Is there some special configuration in the diff Action?

edit: oh, it's the --preview diff. That should be fine, right?

@JelleZijlstra JelleZijlstra self-requested a review October 19, 2023 14:10
@JelleZijlstra JelleZijlstra merged commit 882d879 into psf:main Oct 20, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JelleZijlstra JelleZijlstra JelleZijlstra 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.
2 participants
@henriholopainen @JelleZijlstra