Skip to content

/cpython

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

Check the whitespace of pull requests on Travis #2367

Merged
merged 8 commits into from Jun 24, 2017
Merged

Check the whitespace of pull requests on Travis #2367

merged 8 commits into from Jun 24, 2017
+37 −2

Conversation

@brettcannon
Copy link
Member

brettcannon commented Jun 23, 2017

Closes python/core-workflow#3.
brettcannon added 3 commits Jun 23, 2017
@brettcannon
Modify patchcheck to accept a --travis flag
c68aa2a
@brettcannon
Support an external Python for checking whitespace
7ffc9d7
@brettcannon
Have Travis check for whitespace issues
Loading status checks…
b6fbb9a
@brettcannon brettcannon added the trivial label Jun 23, 2017
brettcannon added 4 commits Jun 23, 2017
@brettcannon
Drop the idea of a srcdir and go back to assuming the built Python is…
98a11fd 
… used
@brettcannon
Move the check to be part of the normal build
Loading status checks…
5a7e6e6
@brettcannon
Just run under Linux
Loading status checks…
7d5dbeb
@brettcannon
Tighten up whitespace check shell command
Loading status checks…
1dc29ec
@brettcannon brettcannon self-assigned this Jun 23, 2017
@brettcannon brettcannon requested a review from ncoghlan Jun 23, 2017
@brettcannon

This comment has been minimized.

Sign in to view
Copy link
Member Author

brettcannon commented Jun 23, 2017

Since this will block PRs from being submitted if I get this wrong I won't be merging it until someone can provide me an approving review.
@ncoghlan
ncoghlan approved these changes Jun 24, 2017
View changes
Copy link
Contributor

ncoghlan left a comment

One minor suggestion regarding the failure message, but the actual check looks good to me.
Tools/scripts/patchcheck.py
if not fixed:
print('No whitespace issues found')
else:
print(f'Please fix the {len(fixed)} file(s) with whitespace issues')

This comment has been minimized.

Sign in to view
Copy link
@ncoghlan

ncoghlan Jun 24, 2017

Contributor

Perhaps specifically mention make patchcheck here? It won't help Windows devs, but it's the easiest option elsewhere.
@brettcannon
Mention `make patchcheck`
Loading status checks…
acabdec
@brettcannon brettcannon merged commit 70cb187 into python:master Jun 24, 2017
3 checks passed
3 checks passed
bedevere/issue-number No issue number necessary.
continuous-integration/appveyor/pr AppVeyor build succeeded
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
@brettcannon brettcannon deleted the brettcannon:check-whitespace branch Jun 24, 2017
brettcannon added a commit to brettcannon/cpython that referenced this pull request Jun 24, 2017
@brettcannon
[3.6] Check the whitespace of pull requests on Travis (pythonGH-2367)
3306cca 
(cherry picked from commit 70cb187)
brettcannon added a commit to brettcannon/cpython that referenced this pull request Jun 24, 2017
@brettcannon
[3.5] Check the whitespace of pull requests on Travis (pythonGH-2367)
14f2684 
(cherry picked from commit 70cb187)
@bedevere-bot

This comment has been minimized.

Sign in to view
Copy link

bedevere-bot commented Jun 24, 2017

GH-2386 is a backport of this pull request to the 3.6 branch.
@bedevere-bot

This comment has been minimized.

Sign in to view
Copy link

bedevere-bot commented Jun 24, 2017

GH-2387 is a backport of this pull request to the 3.5 branch.
brettcannon added a commit that referenced this pull request Jun 25, 2017
@brettcannon
[3.6] Check the whitespace of pull requests on Travis (GH-2367) (GH-2386
Loading status checks…
57ee0c8 
)

(cherry picked from commit 70cb187)
brettcannon added a commit that referenced this pull request Jun 25, 2017
@brettcannon
[3.5] Check the whitespace of pull requests on Travis (GH-2367) (GH-2387
Loading status checks…
4b1468f 
)

(cherry picked from commit 70cb187)
@miss-islington

This comment has been minimized.

Sign in to view
Copy link

miss-islington commented Sep 13, 2017

Thanks @brettcannon for the PR 🌮🎉.. I'm working now to backport this PR to: 2.7.
🐍🍒⛏🤖
@miss-islington

This comment has been minimized.

Sign in to view
Copy link

miss-islington commented Sep 13, 2017

Sorry, @brettcannon, I could not cleanly backport this to 2.7 due to a conflict.
Please backport using cherry_picker on command line.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@ncoghlan ncoghlan

Assignees

@brettcannon brettcannon

Labels
CLA signed needs backport to 2.7
Projects
None yet
Milestone
No milestone
6 participants
@brettcannon @bedevere-bot @miss-islington @ncoghlan @Mariatta @the-knights-who-say-ni
You can’t perform that action at this time.