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

Convert line breaks from DOS to UNIX #734

Merged
merged 2 commits into from
Dec 15, 2020
Merged

Convert line breaks from DOS to UNIX #734

merged 2 commits into from
Dec 15, 2020

Conversation

seisman
Copy link
Member

@seisman seisman commented Dec 15, 2020

Description of proposed changes

It seems @willschlitzer is developing PyGMT under Windows, and the new
files he created have DOS-style line breaks.

To keep the consistency in the whole project, I convert all these files
to UNIX-style line breaks using dos2unix. I don't know how git
and github handles line breaks, but I can't see the changes
in the diff view.

I also removed the x permission of these files.

Perhaps we also need a style check for line breaks?

Reminders

  • Run make format and make check to make sure the code follows the style guide.
  • Add tests for new features or tests that would have caught the bug that you're fixing.
  • Add new public functions/methods/classes to doc/api/index.rst.
  • Write detailed docstrings for all functions/methods.
  • If adding new functionality, add an example to docstrings or tutorials.

Notes

  • You can write /format in the first line of a comment to lint the code automatically

It seems @willschlitzer is developing PyGMT under Windows, and the new
files he created have DOS-style line breaks.

To keep the consistence in the whole project, I convert all these files
to UNIX-style line breaks using `dos2unix`.
@seisman seisman added maintenance Boring but important stuff for the core devs skip-changelog Skip adding Pull Request to changelog labels Dec 15, 2020
@seisman seisman added this to the 0.3.0 milestone Dec 15, 2020
@seisman seisman requested a review from a team December 15, 2020 08:14
@willschlitzer
Copy link
Contributor

Not sure on what's causing this; I'm using PyCharm Professional on Ubuntu 20.04

@weiji14
Copy link
Member

weiji14 commented Dec 15, 2020

Wow, good catch, would not have spotted that. Could you add the style check in this PR too if it's not too much work?

@willschlitzer, try https://www.jetbrains.com/help/pycharm/configuring-line-endings-and-line-separators.html

@weiji14
Copy link
Member

weiji14 commented Dec 15, 2020

So, chicken and egg question, do we merge this PR first, or #736 with the new style check?

Also, should we have a style check for ensuring there's no executable 'x' permissions (755)?

@seisman
Copy link
Member Author

seisman commented Dec 15, 2020

So, chicken and egg question, do we merge this PR first, or #736 with the new style check?

We can merge this PR first, and then #736.

Also, should we have a style check for ensuring there's no executable 'x' permissions (755)?

Sounds a good idea.

@seisman seisman merged commit 5f8a084 into master Dec 15, 2020
@seisman seisman deleted the dos2unix branch December 15, 2020 21:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
maintenance Boring but important stuff for the core devs skip-changelog Skip adding Pull Request to changelog
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants