Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Maintenance #65

Merged
merged 7 commits into from
Oct 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 0 additions & 45 deletions .eslintrc.json

This file was deleted.

2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ jobs:
strategy:
fail-fast: false
matrix:
python-version: ["3.8", "3.9", "3.10"]
python-version: ["3.10", "3.11", "3.12"]
os: [ubuntu-latest, macos-latest]
runs-on: ${{ matrix.os }}
steps:
Expand Down
47 changes: 20 additions & 27 deletions .pre-commit-config.yaml
Original file line number Diff line number Diff line change
@@ -1,37 +1,17 @@
repos:
- repo: https://github.com/pycqa/isort
rev: 5.12.0
- repo: https://github.com/astral-sh/ruff-pre-commit
rev: v0.6.9
hooks:
- id: isort
- repo: https://github.com/psf/black
rev: "22.12.0" # Replace by any tag/version: https://github.com/psf/black/tags
hooks:
- id: black
language_version: python3 # Should be a command that runs python3.6+
- repo: https://github.com/pycqa/flake8
rev: "5.0.4" # pick a git hash / tag to point to
hooks:
- id: flake8
exclude: ^.*/migrations/.*$
- id: ruff
args: [--fix]
- id: ruff-format

- repo: https://github.com/Riverside-Healthcare/djLint
rev: v1.19.12
hooks:
- id: djlint-django
exclude: "^presign/static/vendored/.*"
- repo: https://github.com/pre-commit/mirrors-eslint
rev: v8.1.0
hooks:
- id: eslint
additional_dependencies:
- [email protected]
- "@typescript-eslint/[email protected]"
- "@typescript-eslint/[email protected]"
- [email protected]
- [email protected]
- [email protected]
files: ^.*\.tsx?$ # *.ts and *.tsx
types: [file]
args: ["-c", ".eslintrc.json", "--max-warnings", "0", "--fix"]

- repo: local
hooks:
- id: tsc
Expand All @@ -40,3 +20,16 @@ repos:
language: node
files: ^.*\.tsx?$ # *.ts and *.tsx
pass_filenames: true

- id: eslint
name: eslint
entry: eslint
language: node
additional_dependencies:
- [email protected]
- "@eslint/[email protected]"
- "[email protected]"
- [email protected]
files: ^.*\.tsx?$ # *.ts and *.tsx
types: [file]
args: ["--max-warnings", "0", "--fix"]
12 changes: 12 additions & 0 deletions eslint.config.cjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
typescriptEslint = require("typescript-eslint");
prettier = require("eslint-config-prettier");
js = require("@eslint/js");

module.exports = [
{
ignores: ["**/node_modules", "static/**", "**/build"],
},
js.configs.recommended,
...typescriptEslint.configs.recommended,
prettier,
];
1 change: 1 addition & 0 deletions manage.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#!/nix/store/xiqq153qcphzi6hcdd0wpk4sgj2h2iac-python3-3.10.9/bin/python
"""Django's command-line utility for administrative tasks."""

import os
import sys

Expand Down
1,883 changes: 896 additions & 987 deletions poetry.lock

Large diffs are not rendered by default.

1 change: 0 additions & 1 deletion presign/base/migrations/0001_initial.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@


class Migration(migrations.Migration):

initial = True

dependencies = [
Expand Down
1 change: 0 additions & 1 deletion presign/base/migrations/0002_event_email_textsstore.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@


class Migration(migrations.Migration):

dependencies = [
("base", "0001_initial"),
]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@


class Migration(migrations.Migration):

dependencies = [
("base", "0002_event_email_textsstore"),
]
Expand Down
Loading
Loading