Skip to content

Commit

Permalink
Merge pull request E3SM-Project#77 from xylar/omega/update-clang-format
Browse files Browse the repository at this point in the history
Update pre-commit dependencies and clang-format versions
  • Loading branch information
philipwjones authored Apr 5, 2024
2 parents 58d2aaa + ab95df2 commit a1c424b
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
14 changes: 7 additions & 7 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
files: ^components/omega/
repos:
- repo: https://github.com/Takishima/cmake-pre-commit-hooks
rev: v1.9.0
rev: v1.9.5
hooks:
- id: clang-format
# - id: clang-tidy
Expand All @@ -10,21 +10,21 @@ repos:
# - id: include-what-you-use

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.3.0
rev: v4.5.0
hooks:
- id: trailing-whitespace
- id: end-of-file-fixer

# Can run individually with `pre-commit run isort --all-files`
- repo: https://github.com/PyCQA/isort
rev: 5.12.0
rev: 5.13.2
hooks:
- id: isort
args: ["--settings-file=components/omega/python_lint.cfg"]

# Can run individually with `flynt [file]` or `flynt [source]`
- repo: https://github.com/ikamensh/flynt
rev: '0.78'
rev: 1.0.1
hooks:
- id: flynt
args: ["--fail-on-change", "--verbose", "--line-length=79"]
Expand All @@ -34,17 +34,17 @@ repos:
# Need to use flake8 GitHub mirror due to CentOS git issue with GitLab
# https://github.com/pre-commit/pre-commit/issues/1206
- repo: https://github.com/pycqa/flake8
rev: 6.0.0
rev: 7.0.0
hooks:
- id: flake8
args: ["--config=components/omega/python_lint.cfg"]
additional_dependencies: [flake8-isort]

# Can run individually with `pre-commit run mypy --all-files`
- repo: https://github.com/pre-commit/mirrors-mypy
rev: v0.991
rev: v1.9.0
hooks:
- id: mypy
args: ["--config=components/omega/python_lint.cfg", "--show-error-codes"]
verbose: true
additional_dependencies: ['types-requests']
additional_dependencies: ['types-requests']
4 changes: 2 additions & 2 deletions components/omega/dev-conda.txt
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
pre-commit

# c++ linting
clang-format
clang-tools
clang-format >=18.1.0,<18.2.0
clang-tools >=18.1.0,<18.2.0
cppcheck
cpplint
lizard
Expand Down

0 comments on commit a1c424b

Please sign in to comment.