Movatterモバイル変換


[0]ホーム

URL:


Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

Sign up
Appearance settings

Format and White-spacing#205

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 ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
tonyroberts merged 5 commits intopythonnet:masterfromvmuriart:master
Apr 18, 2016
Merged

Conversation

vmuriart
Copy link
Contributor

To address#184.
Settled on using VS standard formatting for.cs and Python pep8 for.py.
Did some house cleaning and removed/integrated old docs, solution files, etc.

Shouldhopefully help solve constant whitespacing issue on pull requests.

Note, other than white-spacing and formattingnothing in the code has been changed.

@vmuriart
Copy link
ContributorAuthor

@tonyroberts any idea whyAppveyor isn't running anymore on thepull request? Noticed it yesterday. I verified the build against myAppveyor account and its passing, so itTravis-ci

@vmuriart
Copy link
ContributorAuthor

As I side note, i don't fully agree with VS's choice of style, but I'd rather see consistent formatting.

@tonyroberts
Copy link
Contributor

I'm fine with cleaning up whitespace etc, but I think reorganising the file structure should be done in a different PR. In particular, I don't think moving very old and out dated documentation into the root folder is a good idea. I think it would be better if it was updated and then moved - rather than delay these whitespace changes until that's done, dropping them from this PR seems sensible.

@tonyroberts
Copy link
Contributor

Also the wording of commitf72c7e0 comes across as a bit derogatory towards mono (even if that wasn't the intention) and could give someone casually looking through the commit history the impression that mono is less supported than the microsoft runtime, which is not the case.

@tonyroberts
Copy link
Contributor

@vmuriart hmm not sure what happened to the appveyor CI - looks like there was some problem with the github settings, which is odd as I'm pretty sure I didn't change them! Anyway, hopefully it will be working again now..

@vmuriartvmuriartforce-pushed themaster branch 2 times, most recently fromb67d068 toffe376bCompareApril 18, 2016 11:50
@vmuriart
Copy link
ContributorAuthor

@tonyroberts I was having similar thoughts about the file cleanup after i submitted thepr. Just rebased and removed them from this latest one, I'll submit a separate one for those.

Good catch on the mono commit. I meant that in a joking manner (monkey-droppings) with the intention of removing their old format files since they now support the same files as vs.

Looks like travis is still the only one running, atleast on this PR. I had a similar issue on my fork though (Travis being the problem in my case). To fix it I had to remove the hook for it, and re-add it from github.

@vmuriart
Copy link
ContributorAuthor

@tonyroberts what are your thoughts ongit fast-forward for merges? I personally use a combination of bothgit ff and merge-commits depending on the change. Simple changes (1 or 2 small commits) I fastforward, and more complex ones getmerge-committed.

@tonyroberts
Copy link
Contributor

@vmuriart cool, I'll merge this now and take a look at why the commit hooks aren't working later. I'll try just recreating it as you suggest. Thanks for doing this!

@tonyroberts
Copy link
Contributor

tonyroberts commentedApr 18, 2016
edited
Loading

@vmuriart wrt ff, it really depends on the situation. For simple changes I prefer to ff where possible, but when adding significant new feature or a larger set of changes I prefer to use a feature branch and keep the merge commit - so sounds like we're thinking along the same lines :)

@tonyrobertstonyroberts merged commit6139989 intopythonnet:masterApr 18, 2016
@den-run-ai
Copy link
Contributor

@vmuriart@tonyroberts the indent(ation) style for curly braces is a mess even after merge. Here are 2 contradictory examples:

Allman style:
https://github.com/pythonnet/pythonnet/pull/205/files#diff-1b72bb3fa8d022b65bf52c6d695a6562R44

K&R style:
https://github.com/pythonnet/pythonnet/pull/205/files#diff-0ac34f0651a9febc4d8713852516ea6cR50

@vmuriart
Copy link
ContributorAuthor

Good catch. Not sure why the linter's didn't pick it up.

They should all be defaulting the K&R style since that's VS's default.

On Mon, Apr 18, 2016 at 10:50 AM, denfromufanotifications@github.com
wrote:

@vmuriarthttps://github.com/vmuriart@tonyroberts
https://github.com/tonyroberts the indent(ation) style for curly braces
is a mess even after merge. Here are 2 contradictory examples:

Allman style:

https://github.com/pythonnet/pythonnet/pull/205/files#diff-1b72bb3fa8d022b65bf52c6d695a6562R44

K&R style:

https://github.com/pythonnet/pythonnet/pull/205/files#diff-0ac34f0651a9febc4d8713852516ea6cR50


You are receiving this because you were mentioned.
Reply to this email directly or view it on GitHub
#205 (comment)

@vmuriart
Copy link
ContributorAuthor

Ah, just realized whats going on.
I only corrected the formatting on the.cs and.py files for bracketing
and such.
The whitespacing was done to all files. The file you pointed out as being
inconsistent was a.c file that only got the trailing-whitespace
treatment.

On Mon, Apr 18, 2016 at 11:32 AM, Victor Uriartevmuriart@gmail.com wrote:

Good catch. Not sure why the linter's didn't pick it up.

They should all be defaulting the K&R style since that's VS's default.

On Mon, Apr 18, 2016 at 10:50 AM, denfromufanotifications@github.com
wrote:

@vmuriarthttps://github.com/vmuriart@tonyroberts
https://github.com/tonyroberts the indent(ation) style for curly
braces is a mess even after merge. Here are 2 contradictory examples:

Allman style:

https://github.com/pythonnet/pythonnet/pull/205/files#diff-1b72bb3fa8d022b65bf52c6d695a6562R44

K&R style:

https://github.com/pythonnet/pythonnet/pull/205/files#diff-0ac34f0651a9febc4d8713852516ea6cR50


You are receiving this because you were mentioned.
Reply to this email directly or view it on GitHub
#205 (comment)

@vmuriart
Copy link
ContributorAuthor

Didn't realize that there were only 2.c files. Had i known I wouldn't have skipped them...

@den-run-ai
Copy link
Contributor

@vmuriart@tonyroberts I think this PR should include oneeditconfig settings file for other IDEs such as Atom, Sublime, VS Code, MonoDevelop, NPD++. See example here:

https://github.com/OmniSharp/omnisharp-roslyn/blob/dev/.editorconfig

@vmuriart
Copy link
ContributorAuthor

I forgot to add the.editorconfig but I agree. I can include one with thepr to remove some of the old files

@vmuriartvmuriart mentioned this pull requestJan 7, 2017
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

3 participants
@vmuriart@tonyroberts@den-run-ai

[8]ページ先頭

©2009-2025 Movatter.jp