FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Fix mixed line endings with pre-commit by hugovk · Pull Request #148336 · python/cpython · GitHub

  1. python
  2. cpython

Repository navigation

Fix mixed line endings with pre-commit - #148336

Merged
hugovk merged 2 commits into
python:mainfrom
hugovk:mixed-line-ending
Apr 10, 2026
ConversationCommits (2)ChecksFiles changed
Merged

Fix mixed line endings with pre-commit#148336
hugovk merged 2 commits into
python:mainfrom
hugovk:mixed-line-ending

Conversation

hugovk commented Apr 10, 2026 •
edited by github-actions Bot
Loading

Copy link
Copy Markdown
Member

3.15.rst accidentally gained Windows line-endings via a suggestion: f938f01

Let's prevent future ones with mixed-line-ending.

--fix=auto means:

Replaces automatically the most frequent line ending. This is the default argument.

Because we don't want to change things like *.bat or *.filters which must have Windows line endings.

Lib/test/test_tomllib/data/invalid/multiline-basic-str/carriage-return.toml must be excluded as well, so let's exclude all those test data files just in case.

📚 Documentation preview 📚: https://cpython-previews--148336.org.readthedocs.build/

hugovk requested a review from AA-Turner as a code owner April 10, 2026 15:16
hugovk added needs backport to 3.13 only security fixes infra CI, GitHub Actions, buildbots, Dependabot, etc. needs backport to 3.14 bugs and security fixes labels Apr 10, 2026
zware reviewed Apr 10, 2026
View reviewed changes
Comment thread .pre-commit-config.yaml Outdated
Refine exclude
892dcad 
Co-authored-by: Zachary Ware <zachary.ware@gmail.com>
hugovk merged commit fc5df4d into python:main Apr 10, 2026
34 checks passed
hugovk deleted the mixed-line-ending branch April 10, 2026 15:33

miss-islington-app Bot commented Apr 10, 2026

Copy link
Copy Markdown

Thanks @hugovk for the PR 🌮🎉.. I'm working now to backport this PR to: 3.13, 3.14.
🐍🍒⛏🤖

miss-islington-app Bot commented Apr 10, 2026

Copy link
Copy Markdown

Sorry, @hugovk, I could not cleanly backport this to 3.14 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker fc5df4d7236516d11ee949e99e4c08362e3f908d 3.14

miss-islington-app Bot commented Apr 10, 2026

Copy link
Copy Markdown

Sorry, @hugovk, I could not cleanly backport this to 3.13 due to a conflict.
Please backport using cherry_picker on command line.

cherry_picker fc5df4d7236516d11ee949e99e4c08362e3f908d 3.13

hugovk added a commit to hugovk/cpython that referenced this pull request Apr 10, 2026
[3.14] Fix mixed line endings with pre-commit (pythonGH-148336)
a76f9f6 
(cherry picked from commit fc5df4d)

Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Co-authored-by: Zachary Ware <zachary.ware@gmail.com>

bedevere-app Bot commented Apr 10, 2026

Copy link
Copy Markdown

GH-148338 is a backport of this pull request to the 3.14 branch.

bedevere-app Bot removed the needs backport to 3.14 bugs and security fixes label Apr 10, 2026

bedevere-app Bot commented Apr 10, 2026

Copy link
Copy Markdown

GH-148339 is a backport of this pull request to the 3.13 branch.

bedevere-app Bot removed the needs backport to 3.13 only security fixes label Apr 10, 2026
hugovk added a commit that referenced this pull request Apr 10, 2026
[3.14] Fix mixed line endings with pre-commit (GH-148336) (#148338)
429c1d3 
Co-authored-by: Zachary Ware <zachary.ware@gmail.com>
hugovk added a commit that referenced this pull request Apr 10, 2026
[3.13] Fix mixed line endings with pre-commit (GH-148336) (#148339)
a14e4e3 
Co-authored-by: Zachary Ware <zachary.ware@gmail.com>
hugovk added a commit to hugovk/cpython that referenced this pull request Apr 10, 2026
[3.13] Fix mixed line endings with pre-commit (pythonGH-148336)
2bd006c 
(cherry picked from commit fc5df4d)

Co-authored-by: Hugo van Kemenade <1324225+hugovk@users.noreply.github.com>
Co-authored-by: Zachary Ware <zachary.ware@gmail.com>
hugovk mentioned this pull request Apr 18, 2026
Merged
ljfp pushed a commit to ljfp/cpython that referenced this pull request Apr 25, 2026
Fix mixed line endings with pre-commit (python#148336)
14ca3d2 
Co-authored-by: Zachary Ware <zachary.ware@gmail.com>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

zware zware approved these changes
StanFromIreland StanFromIreland approved these changes
AA-Turner Awaiting requested review from AA-Turner AA-Turner is a code owner

Assignees

hugovk

Labels

infra CI, GitHub Actions, buildbots, Dependabot, etc. skip issue skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

Back | FazBrowse Home | New Git URL