GV

GeezerVison

The World Wide Web, restored to 800 pixels of glory.

Home|About|Gaming cabinet|Archives|How it works|Starter sites

On this site

  • Sign in
  • ActionsCI/CD and automation
  • CodespacesCloud development environments
  • All Features
  • Documentation
  • Training
  • Certifications
  • Build with Copilot
  • Customize Copilot
  • Integrations
  • Trending repos
  • GitHub Sponsors
  • Developer articles
  • Enterprises

This view

  • Original page
  • New address

GeezerVison is showing github.com — gh-109408: Revert pre-commit whitespace checks pending portable solution by hugovk · Pull Request #110726 · python/cpython

Conversation

@hugovk

@hugovk hugovk commented Oct 11, 2023 •
edited by bedevere-app Bot
Loading

Uh oh!

There was an error while loading. Please reload this page.

Copy link
Copy Markdown
Member

Re: #110652, revert PRs #109890 and #109891 because we didn't find a portable solution that works on both macOS and Windows.

I kept a couple of the string formatting (and whitespace) improvements:

-    return "{} file{}".format(count, "s" if count != 1 else "")
+    s = "s" if count != 1 else ""
+    return f"{count} file{s}"
-    cmd = "git remote show {}".format(remote_name).split()
+    cmd = f"git remote show {remote_name}".split()

(I suggest finding existing pre-commit checks that can do more-or-less the same thing as the patchcheck things. They don't necessarily need to be exactly the same.)

  • Issue: Move Azure Pipelines CI to GitHub Actions #109408

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
All reactions
@hugovk
Revert python-file-whitespace and c-file-whitespace pending a portabl…
1f25035 
…e solution
@hugovk
hugovk requested a review from AlexWaygood as a code owner October 11, 2023 15:37
@bedevere-app bedevere-app Bot added the awaiting review label Oct 11, 2023
@bedevere-app bedevere-app Bot mentioned this pull request Oct 11, 2023
Move Azure Pipelines CI to GitHub Actions #109408
Closed
@hugovk hugovk added the skip news label Oct 11, 2023
@hugovk
Don't revert too much
105b86c
@hugovk hugovk added the needs backport to 3.12 only security fixes label Oct 11, 2023
@hugovk

hugovk commented Oct 11, 2023

Copy link
Copy Markdown
Member Author

Note: I kept the changes to untabify.py because they look good.
erlend-aasland reacted with thumbs up emoji
All reactions
  • 👍 1 reaction

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
AlexWaygood
AlexWaygood approved these changes Oct 11, 2023
View reviewed changes

@AlexWaygood AlexWaygood left a comment

Copy link
Copy Markdown
Member

There was a problem hiding this comment.

Choose a reason for hiding this comment

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

LGTM. N.B. #109890 made some changes to Tools/patchcheck/untabify.py that haven't been reverted here, but I think they're good changes that we should keep, anyway :)

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
All reactions
@bedevere-app bedevere-app Bot added awaiting core review and removed awaiting review labels Oct 11, 2023
@AlexWaygood
AlexWaygood enabled auto-merge (squash) October 11, 2023 15:55
@AlexWaygood
AlexWaygood merged commit de956b2 into python:main Oct 11, 2023
@miss-islington

miss-islington commented Oct 11, 2023

Copy link
Copy Markdown
Contributor

Thanks @hugovk for the PR, and @AlexWaygood for merging it 🌮🎉.. I'm working now to backport this PR to: 3.12.
🐍🍒⛏🤖
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
@bedevere-app bedevere-app Bot removed the awaiting core review label Oct 11, 2023
miss-islington pushed a commit to miss-islington/cpython that referenced this pull request Oct 11, 2023
@hugovk @miss-islington
pythongh-109408: Revert pre-commit whitespace checks pending portable…
78f1900 
… solution (pythonGH-110726)

(cherry picked from commit de956b2)

Co-authored-by: Hugo van Kemenade <[email protected]>
@bedevere-app

bedevere-app Bot commented Oct 11, 2023

Copy link
Copy Markdown

GH-110730 is a backport of this pull request to the 3.12 branch.
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
@bedevere-app bedevere-app Bot removed the needs backport to 3.12 only security fixes label Oct 11, 2023
@AlexWaygood

AlexWaygood commented Oct 11, 2023

Copy link
Copy Markdown
Member

@erlend-aasland FYI!
erlend-aasland reacted with thumbs up emoji
All reactions
  • 👍 1 reaction

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
@hugovk
hugovk deleted the revert-patchcheck/file-whitespace branch October 11, 2023 16:20
AlexWaygood pushed a commit that referenced this pull request Oct 11, 2023
@miss-islington @hugovk
[3.12] gh-109408: Revert pre-commit whitespace checks pending portabl…
c06ac1b 
…e solution (GH-110726) (#110730)

gh-109408: Revert pre-commit whitespace checks pending portable solution (GH-110726)
(cherry picked from commit de956b2)

Co-authored-by: Hugo van Kemenade <[email protected]>
@erlend-aasland

erlend-aasland commented Oct 11, 2023

Copy link
Copy Markdown
Contributor

Thanks!
All reactions

Sorry, something went wrong.

Uh oh!

There was an error while loading. Please reload this page.
Glyphack pushed a commit to Glyphack/cpython that referenced this pull request Sep 2, 2024
@hugovk @Glyphack
pythongh-109408: Revert pre-commit whitespace checks pending portable…
cedf6ef 
… solution (python#110726)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@AlexWaygood AlexWaygood AlexWaygood approved these changes

Uh oh!

There was an error while loading. Please reload this page.

Assignees

No one assigned

Labels

skip news

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

Uh oh!

There was an error while loading. Please reload this page.

4 participants

@hugovk @miss-islington @AlexWaygood @erlend-aasland
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
You are visitor 01402503 — GeezerVison does not store the pages you look up.
Best viewed with Netscape Navigator 4.7 or Internet Explorer 6 at 800×600. No cookies required.