diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index ad6b3719..3e2509d6 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -4,6 +4,7 @@ ci: skip: - check-dev-files - mypy + - prettier - pyright - repoma-self-check - taplo @@ -56,7 +57,7 @@ repos: files: ^\.pre\-commit\-(config|hooks)\.yaml$ - repo: https://github.com/psf/black-pre-commit-mirror - rev: 23.10.1 + rev: 23.11.0 hooks: - id: black @@ -66,7 +67,7 @@ repos: - id: blacken-docs - repo: https://github.com/streetsidesoftware/cspell-cli - rev: v7.3.2 + rev: v8.1.1 hooks: - id: cspell @@ -92,17 +93,17 @@ repos: - python - repo: https://github.com/pre-commit/mirrors-prettier - rev: v3.0.3 + rev: v4.0.0-alpha.3-1 hooks: - id: prettier - repo: https://github.com/ComPWA/mirrors-pyright - rev: v1.1.334 + rev: v1.1.339 hooks: - id: pyright - repo: https://github.com/astral-sh/ruff-pre-commit - rev: v0.1.4 + rev: v0.1.7 hooks: - id: ruff args: [--fix] diff --git a/environment.yml b/environment.yml index 3061e189..a924cf81 100644 --- a/environment.yml +++ b/environment.yml @@ -6,3 +6,5 @@ dependencies: - pip - pip: - -e .[dev] +variables: + PRETTIER_LEGACY_CLI: "1" diff --git a/src/repoma/check_dev_files/citation.py b/src/repoma/check_dev_files/citation.py index d9212bf5..a72ac3e2 100644 --- a/src/repoma/check_dev_files/citation.py +++ b/src/repoma/check_dev_files/citation.py @@ -61,13 +61,11 @@ def remove_zenodo_json() -> None: def _convert_zenodo(zenodo: dict) -> CommentedMap: - citation_cff = CommentedMap( - { - "cff-version": "1.2.0", - "message": "If you use this software, please cite it as below.", - "title": FoldedScalarString(zenodo["title"]), - } - ) + citation_cff = CommentedMap({ + "cff-version": "1.2.0", + "message": "If you use this software, please cite it as below.", + "title": FoldedScalarString(zenodo["title"]), + }) description = zenodo.get("description") if description is not None: diff --git a/src/repoma/check_dev_files/deprecated.py b/src/repoma/check_dev_files/deprecated.py index 3388ff8e..296aa6f6 100644 --- a/src/repoma/check_dev_files/deprecated.py +++ b/src/repoma/check_dev_files/deprecated.py @@ -19,12 +19,10 @@ def remove_deprecated_tools(keep_issue_templates: bool) -> None: def _remove_github_issue_templates() -> None: - remove_configs( - [ - ".github/ISSUE_TEMPLATE", - ".github/pull_request_template.md", - ] - ) + remove_configs([ + ".github/ISSUE_TEMPLATE", + ".github/pull_request_template.md", + ]) def _remove_markdownlint() -> None: diff --git a/src/repoma/errors.py b/src/repoma/errors.py index 47fd55a4..82836d51 100644 --- a/src/repoma/errors.py +++ b/src/repoma/errors.py @@ -1,4 +1,5 @@ """Exceptions that are caught by a pre-commit hook and printed instead.""" + class PrecommitError(RuntimeError): pass diff --git a/src/repoma/utilities/vscode.py b/src/repoma/utilities/vscode.py index 2490035e..aec6979b 100644 --- a/src/repoma/utilities/vscode.py +++ b/src/repoma/utilities/vscode.py @@ -185,9 +185,9 @@ def sort_case_insensitive(dct): # type: ignore[no-untyped-def] OrderedDict([('coverage-gutters', ['coverage.xml', 'test']), ('cSpell.enabled', True)]) """ if isinstance(dct, abc.Mapping): - return collections.OrderedDict( - {k: sort_case_insensitive(dct[k]) for k in sorted(dct, key=str.lower)} - ) + return collections.OrderedDict({ + k: sort_case_insensitive(dct[k]) for k in sorted(dct, key=str.lower) + }) if isinstance(dct, str): return dct if isinstance(dct, abc.Iterable):