Skip to content

Commit 632c739

Browse files
JoostJMhjmjohnson
authored andcommitted
CI: Re-enable pre-commit, disable failing checks.
See issue AIM-Harvard#899
1 parent 9c52147 commit 632c739

File tree

2 files changed

+52
-51
lines changed

2 files changed

+52
-51
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ env:
1919

2020
jobs:
2121
pre-commit:
22-
if: ${{ github.ref_name != 'refactor-build-system' }}
2322
name: Format
2423
runs-on: ubuntu-latest
2524
steps:
@@ -38,7 +37,7 @@ jobs:
3837
checks:
3938
name: Check Python ${{ matrix.python-version }} on ${{ matrix.runs-on }}
4039
runs-on: ${{ matrix.runs-on }}
41-
#needs: [pre-commit]
40+
needs: [pre-commit]
4241
strategy:
4342
fail-fast: false
4443
matrix:

.pre-commit-config.yaml

Lines changed: 51 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -18,73 +18,75 @@ repos:
1818
- id: check-case-conflict
1919
- id: check-merge-conflict
2020
- id: check-symlinks
21-
- id: check-yaml
21+
#- id: check-yaml # See Issue #899 (https://github.com/AIM-Harvard/pyradiomics/issues/899)
2222
- id: debug-statements
2323
- id: end-of-file-fixer
2424
- id: mixed-line-ending
25-
- id: name-tests-test
26-
args: ["--pytest-test-first"]
25+
#- id: name-tests-test # See Issue #899 (https://github.com/AIM-Harvard/pyradiomics/issues/899)
26+
# args: ["--pytest-test-first"]
2727
- id: requirements-txt-fixer
28-
- id: trailing-whitespace
28+
#- id: trailing-whitespace # See Issue #899 (https://github.com/AIM-Harvard/pyradiomics/issues/899)
2929

3030
- repo: https://github.com/pre-commit/pygrep-hooks
3131
rev: "v1.10.0"
3232
hooks:
33-
- id: rst-backticks
33+
#- id: rst-backticks # See Issue #899 (https://github.com/AIM-Harvard/pyradiomics/issues/899)
3434
- id: rst-directive-colons
3535
- id: rst-inline-touching-normal
3636

37-
- repo: https://github.com/rbubley/mirrors-prettier
38-
rev: "v3.4.2"
39-
hooks:
40-
- id: prettier
41-
types_or: [yaml, markdown, html, css, scss, javascript, json]
42-
args: [--prose-wrap=always]
37+
# See Issue #899 (https://github.com/AIM-Harvard/pyradiomics/issues/899)
4338

44-
- repo: https://github.com/astral-sh/ruff-pre-commit
45-
rev: "v0.9.2"
46-
hooks:
47-
- id: ruff
48-
args: ["--fix", "--show-fixes"]
49-
- id: ruff-format
39+
#- repo: https://github.com/rbubley/mirrors-prettier
40+
# rev: "v3.4.2"
41+
# hooks:
42+
# - id: prettier
43+
# types_or: [yaml, markdown, html, css, scss, javascript, json]
44+
# args: [--prose-wrap=always]
5045

51-
- repo: https://github.com/pre-commit/mirrors-clang-format
52-
rev: "v19.1.7"
53-
hooks:
54-
- id: clang-format
55-
types_or: [c++, c, cuda]
46+
#- repo: https://github.com/astral-sh/ruff-pre-commit
47+
# rev: "v0.9.2"
48+
# hooks:
49+
# - id: ruff
50+
# args: ["--fix", "--show-fixes"]
51+
# - id: ruff-format
5652

57-
- repo: https://github.com/pre-commit/mirrors-mypy
58-
rev: "v1.14.1"
59-
hooks:
60-
- id: mypy
61-
files: src|tests
62-
args: []
63-
additional_dependencies:
64-
- pytest
53+
#- repo: https://github.com/pre-commit/mirrors-clang-format
54+
# rev: "v19.1.7"
55+
# hooks:
56+
# - id: clang-format
57+
# types_or: [c++, c, cuda]
6558

66-
- repo: https://github.com/codespell-project/codespell
67-
rev: "v2.3.0"
68-
hooks:
69-
- id: codespell
59+
#- repo: https://github.com/pre-commit/mirrors-mypy
60+
# rev: "v1.14.1"
61+
# hooks:
62+
# - id: mypy
63+
# files: src|tests
64+
# args: []
65+
# additional_dependencies:
66+
# - pytest
7067

71-
- repo: https://github.com/shellcheck-py/shellcheck-py
72-
rev: "v0.10.0.1"
73-
hooks:
74-
- id: shellcheck
68+
#- repo: https://github.com/codespell-project/codespell
69+
# rev: "v2.3.0"
70+
# hooks:
71+
# - id: codespell
7572

76-
- repo: local
77-
hooks:
78-
- id: disallow-caps
79-
name: Disallow improper capitalization
80-
language: pygrep
81-
entry: PyBind|Numpy|Cmake|CCache|Github|PyTest
82-
exclude: .pre-commit-config.yaml
73+
#- repo: https://github.com/shellcheck-py/shellcheck-py
74+
# rev: "v0.10.0.1"
75+
# hooks:
76+
# - id: shellcheck
8377

84-
- repo: https://github.com/cheshirekow/cmake-format-precommit
85-
rev: "v0.6.13"
86-
hooks:
87-
- id: cmake-format
78+
#- repo: local
79+
# hooks:
80+
# - id: disallow-caps
81+
# name: Disallow improper capitalization
82+
# language: pygrep
83+
# entry: PyBind|Numpy|Cmake|CCache|Github|PyTest
84+
# exclude: .pre-commit-config.yaml
85+
86+
#- repo: https://github.com/cheshirekow/cmake-format-precommit
87+
# rev: "v0.6.13"
88+
# hooks:
89+
# - id: cmake-format
8890

8991
- repo: https://github.com/abravalheri/validate-pyproject
9092
rev: "v0.23"

0 commit comments

Comments
 (0)