Skip to content

Commit

Permalink
Merge pull request #127 from glotzerlab/formatting-changes
Browse files Browse the repository at this point in the history
Apply pre-commit formatters
  • Loading branch information
joaander committed May 4, 2021
2 parents 91a3f21 + 5164761 commit 18961d1
Show file tree
Hide file tree
Showing 51 changed files with 498 additions and 497 deletions.
4 changes: 2 additions & 2 deletions .clang-format
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ AccessModifierOffset: 0
AlignAfterOpenBracket: Align
AlignEscapedNewlines: 'Left'
AlignOperands: 'true'
AlignTrailingComments: 'true'
AlignTrailingComments: 'false'
AllowAllArgumentsOnNextLine: 'false'
AllowAllParametersOfDeclarationOnNextLine: 'false'
AllowShortFunctionsOnASingleLine: Empty
Expand All @@ -29,7 +29,7 @@ SpaceAfterTemplateKeyword: 'false'
SpaceBeforeParens: ControlStatements
SpacesInAngles: 'false'
SpaceInEmptyParentheses: false
Standard: Cpp11
Standard: c++14
TabWidth: '4'
UseTab: Never

Expand Down
1 change: 0 additions & 1 deletion .github/workflows/make-changelog-md.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,3 @@ pcregrep -M "^${tag}.*\n\^\^\^\^+.*\n(.*\n)+?(\^\^\^\^+|^---+)$" CHANGELOG.rst \
| tail -n +3 \
| head -n -2 \
| pandoc --from=rst --to=markdown

2 changes: 1 addition & 1 deletion .github/workflows/style_check.yml
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ jobs:
- uses: actions/setup-python@v2.2.2
- uses: pre-commit/action@v2.0.2
with:
extra_args: --all-files --hook-stage manual
extra_args: --all-files --hook-stage manual clang-format

# This job is used to provide a single requirement for branch merge conditions.
checks_complete:
Expand Down
3 changes: 3 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
ci:
skip: [clang-format]

repos:
- repo: https://github.com/pre-commit/pre-commit-hooks
rev: 'v3.4.0'
Expand Down
1 change: 0 additions & 1 deletion ContributorAgreement.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,3 @@ you are authorized to sign this contract on behalf of your company (if identifie
Based on the Sun Contributor Agreement - version 1.5.
This document is licensed under a Creative Commons Attribution-Share Alike 3.0 Unported License
http://creativecommons.org/licenses/by-sa/3.0/

0 comments on commit 18961d1

Please sign in to comment.