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

Preview: Keep requiring two empty lines between module-level docstring and first function or class definition. #4028

Merged
merged 1 commit into from Nov 6, 2023

Conversation

yilei
Copy link
Contributor

@yilei yilei commented Nov 6, 2023

Fixes #4027.

Description

Checklist - did you ...

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

Copy link

github-actions bot commented Nov 6, 2023

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

╭─────────────────────── Summary ────────────────────────╮
│ 2 projects & 9 files changed / 9 changes [+9/-0]       │
│                                                        │
│ ... out of 2 509 460 lines, 11 752 files & 23 projects │
╰────────────────────────────────────────────────────────╯

Differences found.

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

@JelleZijlstra JelleZijlstra merged commit e808e61 into psf:main Nov 6, 2023
41 checks passed
@yilei yilei deleted the blanklines branch November 7, 2023 02:52
copybara-service bot pushed a commit to google/pyink that referenced this pull request Nov 15, 2023
This keeps two blank lines between the module docstring and the following def/class when there are no other code in between.

Why cherrypick not rebase? Pyink is not yet ready to rebase to Black 23.11.0 yet, I'm waiting for psf#4012 to be merged as Pyink has local patches related by hugging parens.

PiperOrigin-RevId: 582472645
copybara-service bot pushed a commit to google/pyink that referenced this pull request Nov 15, 2023
This keeps two blank lines between the module docstring and the following def/class when there are no other code in between.

Why cherrypick not rebase? Pyink is not yet ready to rebase to Black 23.11.0, I'm waiting for psf#4012 to be merged as Pyink has local patches related to hugging parens.

PiperOrigin-RevId: 582472645
copybara-service bot pushed a commit to google/pyink that referenced this pull request Nov 15, 2023
This keeps two blank lines between the module docstring and the following def/class when there are no other code in between.

Why cherrypick not rebase? Pyink is not yet ready to rebase to Black 23.11.0, I'm waiting for psf#4012 to be merged as Pyink has local patches related to hugging parens.

Also added two missing patches.

PiperOrigin-RevId: 582472645
copybara-service bot pushed a commit to google/pyink that referenced this pull request Nov 15, 2023
This keeps two blank lines between the module docstring and the following def/class when there are no other code in between.

Why cherrypick not rebase? Pyink is not yet ready to rebase to Black 23.11.0, I'm waiting for psf#4012 to be merged as Pyink has local patches related to hugging parens.

Also added two missing patches.

PiperOrigin-RevId: 582704838
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Conflict in blank lines after module docstring and before function
3 participants