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

Pre-commit: Update a number of pre-commit hooks #6236

Merged
merged 1 commit into from
Dec 21, 2023

Conversation

sphuber
Copy link
Contributor

@sphuber sphuber commented Dec 21, 2023

  • Add the check-merge-conflict hook
  • Explicitly define target line ending for mixed-line-ending
  • Change fix-encoding-pragma to actually remove the pragma
    This was mostly useful when Python 2 was still in use but now that
    Python 3 is the only version supported, this encoding pragma is no
    longer necessary.

* Add the `check-merge-conflict` hook
* Explicitly define target line ending for `mixed-line-ending`
* Change `fix-encoding-pragma` to actually remove the pragma
  This was mostly useful when Python 2 was still in use but now that
  Python 3 is the only version supported, this encoding pragma is no
  longer necessary.
@sphuber sphuber force-pushed the fix/pre-commit-hooks branch from 1f7be33 to 0fb7cd0 Compare December 21, 2023 11:10
@sphuber sphuber merged commit a4ced7a into aiidateam:main Dec 21, 2023
20 checks passed
@sphuber sphuber deleted the fix/pre-commit-hooks branch December 21, 2023 11:42
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

1 participant