diff --git a/.eslintrc.js b/.eslintrc.js deleted file mode 100644 index 6406d93..0000000 --- a/.eslintrc.js +++ /dev/null @@ -1,31 +0,0 @@ -module.exports = { - globals: { - __PATH_PREFIX__: true, - }, - extends: ["eslint:recommended", "prettier"], - rules: { - indent: ["error", 2], - "no-console": "off", - strict: ["error", "global"], - curly: "warn", - semi: ["error", "never"], - "space-in-parens": ["error", "never"], - "space-before-blocks": ["error", "always"], - "react/prop-types": "off", - }, - ignorePatterns: [ - "{{ cookiecutter.module_name }}/static/js/lib/**/*.js", - "venv/**/*", - "/static/**/*", - ], - parserOptions: { - sourceType: "module", - allowImportExportEverywhere: true, - ecmaVersion: 2022, - }, - env: { - browser: true, - node: true, - es2021: true, - }, -} diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index f1205ce..0599134 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -1,12 +1,4 @@ repos: - # Standard pre-commit hooks - - repo: https://github.com/pre-commit/pre-commit-hooks - rev: v2.3.0 - hooks: - - id: check-yaml - - id: end-of-file-fixer - - id: trailing-whitespace - # Black config (Python formatter) - repo: https://github.com/psf/black rev: 22.3.0 @@ -22,32 +14,3 @@ repos: - id: flake8 args: [--config=.flake8] - # DjHTML config (Django template indenter) - - repo: https://github.com/rtts/djhtml - rev: v1.5.1 - hooks: - - id: djhtml - # Indent only HTML files in template directories - files: .*/templates/.*\.html$ - args: [--tabwidth=2] - - # Prettier config (Javascript formatter) - # See ./.prettierjson.rc for additional configs - - repo: https://github.com/pre-commit/mirrors-prettier - rev: v2.5.1 - hooks: - - id: prettier - exclude: ^(councilmatic_core/static/js/lib/|councilmatic_core/static/css/bootstrap|councilmatic_core/templates/) - files: \.(js|ts|jsx|tsx|css|less|json|markdown|md|yaml|yml)$ - - # Eslint config (Javascript linter) - # See ./.eslintrc.js for additional configs - - repo: https://github.com/pre-commit/mirrors-eslint - rev: "1f7d592" - hooks: - - id: eslint - exclude: ^(councilmatic_core/static/js/lib/) - additional_dependencies: - - eslint@8.19.0 - - eslint-plugin-react@7.30.1 - - eslint-config-prettier@8.5.0 diff --git a/.prettierrc.json b/.prettierrc.json deleted file mode 100644 index f6ca428..0000000 --- a/.prettierrc.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "trailingComma": "es5", - "tabWidth": 2, - "semi": false, - "singleQuote": false -} diff --git a/councilmatic_core/migrations/0053_add_councilmatic_bio.py b/councilmatic_core/migrations/0053_add_councilmatic_bio.py index cd8c362..b3cc364 100644 --- a/councilmatic_core/migrations/0053_add_councilmatic_bio.py +++ b/councilmatic_core/migrations/0053_add_councilmatic_bio.py @@ -6,13 +6,13 @@ class Migration(migrations.Migration): dependencies = [ - ('councilmatic_core', '0052_convert_last_action_date_to_datefield'), + ("councilmatic_core", "0052_convert_last_action_date_to_datefield"), ] operations = [ migrations.AddField( - model_name='person', - name='councilmatic_biography', + model_name="person", + name="councilmatic_biography", field=models.TextField(blank=True, null=True), ), ]