Skip to content

Commit

Permalink
Merge branch 'master' into fix/636
Browse files Browse the repository at this point in the history
  • Loading branch information
chrisclark authored Jul 8, 2024
2 parents acdcdfc + 22eb04d commit 01fb21c
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 7 deletions.
4 changes: 1 addition & 3 deletions .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,5 @@ jobs:
steps:
- uses: actions/checkout@v4

- run: python -Im pip install --user ruff

- name: Run ruff
run: ruff check --output-format=github explorer
run: pipx run ruff check --output-format=github explorer
8 changes: 4 additions & 4 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -12,13 +12,13 @@ default_language_version:

repos:
- repo: https://github.com/asottile/pyupgrade
rev: v3.15.0
rev: v3.16.0
hooks:
- id: pyupgrade
args: ["--py38-plus"]

- repo: https://github.com/adamchainz/django-upgrade
rev: "1.15.0"
rev: "1.19.0"
hooks:
- id: django-upgrade
args: [--target-version, "3.2"]
Expand All @@ -29,13 +29,13 @@ repos:
- id: yesqa

- repo: https://github.com/pre-commit/pre-commit-hooks
rev: v4.5.0
rev: v4.6.0
hooks:
- id: check-merge-conflict
- id: mixed-line-ending

- repo: https://github.com/astral-sh/ruff-pre-commit
rev: "v0.1.11"
rev: "v0.5.0"
hooks:
- id: ruff
args: [--fix, --exit-non-zero-on-fix]
Expand Down

0 comments on commit 01fb21c

Please sign in to comment.