Merge branch 'staging' into pyproject-build

cancervariants · Jul 16, 2024 · 6da355f · 6da355f
2 parents d101161 + 2548408
commit 6da355f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,12 +1,13 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v1.4.0
+    rev: v4.6.0 # pre-commit-hooks version
     hooks:
       - id: check-added-large-files
-        args: ["--maxkb=2000"]
       - id: detect-private-key
       - id: trailing-whitespace
       - id: end-of-file-fixer
+      - id: check-merge-conflict
+      - id: detect-aws-credentials
   - repo: https://github.com/psf/black
     rev: 23.7.0
     hooks:
@@ -34,3 +35,4 @@ repos:
     rev: "v2.7.1"
     hooks:
       - id: prettier
+minimum_pre_commit_version: 3.7.1
diff --git a/server/pyproject.toml b/server/pyproject.toml
@@ -43,7 +43,7 @@ dev = [
     "psycopg2-binary",
     "ruff",
     "black",
-    "pre-commit",
+    "pre-commit>=3.7.1",
     "gene-normalizer ~= 0.1.39",
     "pydantic-to-typescript",
 ]