Skip to content

Commit

Permalink
Merge pull request #1278 from glotzerlab/refactor-pre-commit
Browse files Browse the repository at this point in the history
Refactor pre-commit.
  • Loading branch information
joaander authored Sep 6, 2024
2 parents c61aca6 + b7e0463 commit 4c0c338
Show file tree
Hide file tree
Showing 125 changed files with 2,358 additions and 2,256 deletions.
11 changes: 10 additions & 1 deletion .clang-tidy
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,10 @@
# readability-function-cognitive-complexity: Some heavily nested functions trigger this, it could be possible to rewrite these but that's out of scope at the moment.
# readability-magic-numbers: Wigner3j contains (necessary) magic numbers.
# readability-redundant-member-init: If the constructor changes or if there are multiple constructor signatures, prefer to be explicit.
# readability-identifier-length: We use short identifiers sparingly and in places where they are more readable than long ones.
# bugprone-easily-swappable-parameters: Many methods unavoidably take multiple float parameters.
# performance-enum-size: There is little to be gained switching from 4-byt ints to 1 byte enums.
# portability-simd-intrinsics: Allow intrinsics to improve performance.

Checks: 'bugprone-*,
cert-*,
Expand All @@ -26,4 +30,9 @@ Checks: 'bugprone-*,
-readability-avoid-const-params-in-decls,
-readability-function-cognitive-complexity,
-readability-magic-numbers,
-readability-redundant-member-init'
-readability-redundant-member-init,
-readability-identifier-length,
-bugprone-easily-swappable-parameters,
-performance-enum-size,
-portability-simd-intrinsics,
'
2 changes: 1 addition & 1 deletion .github/workflows/build_wheels.yml
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ jobs:
gsd==${{ matrix.python.oldest_gsd }}
matplotlib==${{ matrix.python.oldest_matplotlib }}
# Test only the currently ported modules
CIBW_TEST_COMMAND: "cd {package}/tests && pytest test_box_Box.py test_parallel.py -v --log-level=DEBUG"
CIBW_TEST_COMMAND: "cd {package}/tests && pytest test_box_box.py test_parallel.py test_locality_*.py test_data.py test_pmft.py test_util.py -v --log-level=DEBUG"
# CIBW_TEST_COMMAND: "cd {package}/tests && pytest . -v --log-level=DEBUG"

- uses: actions/upload-artifact@834a144ee995460fba8ed112a2fc961b36a5ec5a # v4.3.6
Expand Down
2 changes: 0 additions & 2 deletions .github/workflows/env-files/environment.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,6 @@ channels:

dependencies:
- python==3.12
# TODO: Update to a newer cppcheck and adjust all C++ code to meet the new style guidlines
- cppcheck<2.0.0 # [linux64]
- tbb
- tbb-devel
- ninja
Expand Down
Loading

0 comments on commit 4c0c338

Please sign in to comment.