|
| 1 | +diff a/.pre-commit-config.yaml b/.pre-commit-config.yaml (rejected hunks) |
| 2 | +@@ -1,50 +1,53 @@ |
| 3 | + fail_fast: false |
| 4 | + default_language_version: |
| 5 | +- python: python3 |
| 6 | ++ python: python3 |
| 7 | + default_stages: |
| 8 | +- - commit |
| 9 | +- - push |
| 10 | ++ - commit |
| 11 | ++ - push |
| 12 | + minimum_pre_commit_version: 2.16.0 |
| 13 | + repos: |
| 14 | +- - repo: https://github.com/psf/black |
| 15 | +- rev: "23.11.0" |
| 16 | +- hooks: |
| 17 | +- - id: black |
| 18 | +- - repo: https://github.com/asottile/blacken-docs |
| 19 | +- rev: 1.16.0 |
| 20 | +- hooks: |
| 21 | +- - id: blacken-docs |
| 22 | +- - repo: https://github.com/pre-commit/mirrors-prettier |
| 23 | +- rev: v3.1.0 |
| 24 | +- hooks: |
| 25 | +- - id: prettier |
| 26 | +- # Newer versions of node don't work on systems that have an older version of GLIBC |
| 27 | +- # (in particular Ubuntu 18.04 and Centos 7) |
| 28 | +- # EOL of Centos 7 is in 2024-06, we can probably get rid of this then. |
| 29 | +- # See https://github.com/scverse/cookiecutter-scverse/issues/143 and |
| 30 | +- # https://github.com/jupyterlab/jupyterlab/issues/12675 |
| 31 | +- language_version: "17.9.1" |
| 32 | +- - repo: https://github.com/charliermarsh/ruff-pre-commit |
| 33 | +- rev: v0.1.6 |
| 34 | +- hooks: |
| 35 | +- - id: ruff |
| 36 | +- args: [--fix, --exit-non-zero-on-fix] |
| 37 | +- - repo: https://github.com/pre-commit/pre-commit-hooks |
| 38 | +- rev: v4.5.0 |
| 39 | +- hooks: |
| 40 | +- - id: detect-private-key |
| 41 | +- - id: check-ast |
| 42 | +- - id: end-of-file-fixer |
| 43 | +- - id: mixed-line-ending |
| 44 | +- args: [--fix=lf] |
| 45 | +- - id: trailing-whitespace |
| 46 | +- - id: check-case-conflict |
| 47 | +- - repo: local |
| 48 | +- hooks: |
| 49 | +- - id: forbid-to-commit |
| 50 | +- name: Don't commit rej files |
| 51 | +- entry: | |
| 52 | +- Cannot commit .rej files. These indicate merge conflicts that arise during automated template updates. |
| 53 | +- Fix the merge conflicts manually and remove the .rej files. |
| 54 | +- language: fail |
| 55 | +- files: '.*\.rej$' |
| 56 | ++ - repo: https://github.com/psf/black |
| 57 | ++ rev: "23.11.0" |
| 58 | ++ hooks: |
| 59 | ++ - id: black |
| 60 | ++ - repo: https://github.com/asottile/blacken-docs |
| 61 | ++ rev: 1.16.0 |
| 62 | ++ hooks: |
| 63 | ++ - id: blacken-docs |
| 64 | ++ - repo: https://github.com/pre-commit/mirrors-prettier |
| 65 | ++ rev: v3.1.0 |
| 66 | ++ hooks: |
| 67 | ++ - id: prettier |
| 68 | ++ # Newer versions of node don't work on systems that have an older version of GLIBC |
| 69 | ++ # (in particular Ubuntu 18.04 and Centos 7) |
| 70 | ++ # EOL of Centos 7 is in 2024-06, we can probably get rid of this then. |
| 71 | ++ # See https://github.com/scverse/cookiecutter-scverse/issues/143 and |
| 72 | ++ # https://github.com/jupyterlab/jupyterlab/issues/12675 |
| 73 | ++ language_version: "17.9.1" |
| 74 | ++ - repo: https://github.com/astral-sh/ruff-pre-commit |
| 75 | ++ rev: v0.1.6 |
| 76 | ++ hooks: |
| 77 | ++ - id: ruff |
| 78 | ++ args: [--fix, --exit-non-zero-on-fix] |
| 79 | ++ - repo: https://github.com/pre-commit/pre-commit-hooks |
| 80 | ++ rev: v4.5.0 |
| 81 | ++ hooks: |
| 82 | ++ - id: detect-private-key |
| 83 | ++ - id: check-ast |
| 84 | ++ - id: end-of-file-fixer |
| 85 | ++ - id: mixed-line-ending |
| 86 | ++ args: [--fix=lf] |
| 87 | ++ - id: trailing-whitespace |
| 88 | ++ - id: check-case-conflict |
| 89 | ++ # Check that there are no merge conflicts (could be generated by template sync) |
| 90 | ++ - id: check-merge-conflict |
| 91 | ++ args: [--assume-in-merge] |
| 92 | ++ - repo: local |
| 93 | ++ hooks: |
| 94 | ++ - id: forbid-to-commit |
| 95 | ++ name: Don't commit rej files |
| 96 | ++ entry: | |
| 97 | ++ Cannot commit .rej files. These indicate merge conflicts that arise during automated template updates. |
| 98 | ++ Fix the merge conflicts manually and remove the .rej files. |
| 99 | ++ language: fail |
| 100 | ++ files: '.*\.rej$' |
0 commit comments