Skip to content

Commit

Permalink
Merge branch 'dev' into 'master'
Browse files Browse the repository at this point in the history
Merge Dev sur Master

See merge request la-fabrique-numerique/biocarburants!260
  • Loading branch information
Yohann Ulreich committed Dec 5, 2024
2 parents ff023bf + b3c065c commit 8cdc29e
Show file tree
Hide file tree
Showing 174 changed files with 3,046 additions and 1,118 deletions.
9 changes: 9 additions & 0 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,14 +1,23 @@
default_install_hook_types: [pre-commit, pre-push]
repos:
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.6.2
hooks:
- id: ruff
args: [ --fix ]
stages: [pre-commit]
- id: ruff-format
stages: [pre-commit]
- repo: local
hooks:
- id: run-npm-script
name: Eslint/Prettier
entry: bash -c 'cd front && npm run lint'
language: system
files: ^front/
stages: [pre-commit]
- id: check-backend-schema
name: CheckBackendSchema
entry: bash -c 'npm run generate-and-check-types'
language: system
stages: [pre-push]
1 change: 1 addition & 0 deletions Pipfile
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ python-docx = "*"
django-filter = "*"
drf-spectacular = "*"
drf-nested-routers = "*"
psutil = "*"

[dev-packages]
django-stubs = "*"
Expand Down
546 changes: 287 additions & 259 deletions Pipfile.lock

Large diffs are not rendered by default.

Loading

0 comments on commit 8cdc29e

Please sign in to comment.