From 6ec70322d489cada565d3a38f8ff2023069de024 Mon Sep 17 00:00:00 2001 From: Allen Winter Date: Thu, 10 Oct 2024 12:31:11 -0400 Subject: [PATCH] pre-commit - switch to markdownlint-cli2 --- .krazy | 2 ++ .markdownlint.json | 16 ++++++++++++++++ .mdlrc | 1 - .mdlrc.rb | 5 ----- .pre-commit-config.yaml | 6 ++---- .reuse/dep5 | 2 +- 6 files changed, 21 insertions(+), 11 deletions(-) create mode 100644 .markdownlint.json delete mode 100644 .mdlrc delete mode 100644 .mdlrc.rb diff --git a/.krazy b/.krazy index 6e6dec563..ad33959bc 100644 --- a/.krazy +++ b/.krazy @@ -16,6 +16,8 @@ EXCLUDE style SKIP /fwd_headers/ SKIP /flutter/generated/ SKIP Doxyfile.cmake +SKIP .markdownlint.json +SKIP book/searchindex.json SKIP /src/3rdparty/|/examples/qtquick/CMakeFiles/ #skip CMake files diff --git a/.markdownlint.json b/.markdownlint.json new file mode 100644 index 000000000..e2f811ca3 --- /dev/null +++ b/.markdownlint.json @@ -0,0 +1,16 @@ +{ + "default": true, + "MD007": { + "indent": 2, + "start_indented": false + }, + "MD013": { + "line_length": 100, + "tables": false, + "code_blocks": false + }, + "MD029": { + "style": "ordered" + }, + "MD033": false +} diff --git a/.mdlrc b/.mdlrc deleted file mode 100644 index 3acbfecaa..000000000 --- a/.mdlrc +++ /dev/null @@ -1 +0,0 @@ -style ".mdlrc.rb" diff --git a/.mdlrc.rb b/.mdlrc.rb deleted file mode 100644 index b9f524407..000000000 --- a/.mdlrc.rb +++ /dev/null @@ -1,5 +0,0 @@ -all -rule 'MD007', :indent => 2, :start_indented => false -rule 'MD013', :line_length => 100, :tables => false -rule 'MD029', :style => :ordered -exclude_rule 'MD033' diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml index 2975d28a0..e420db04a 100644 --- a/.pre-commit-config.yaml +++ b/.pre-commit-config.yaml @@ -46,12 +46,10 @@ repos: exclude: (.py.cmake|Doxyfile.cmake|examples/flutter/) - id: cmake-format exclude: (.py.cmake|Doxyfile.cmake|examples/flutter/) -- repo: https://github.com/markdownlint/markdownlint +- repo: https://github.com/DavidAnson/markdownlint-cli2 rev: v0.12.0 hooks: - - id: markdownlint - entry: mdl - language: ruby + - id: markdownlint-cli2 files: \.(md|mdown|markdown)$ exclude: (docs/book/) - repo: https://github.com/fsfe/reuse-tool diff --git a/.reuse/dep5 b/.reuse/dep5 index 5b156fab3..c7746a710 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -14,7 +14,7 @@ Copyright: Klarälvdalens Datakonsult AB, a KDAB Group company License: GPL-2.0-only OR GPL-3.0-only #misc config files -Files: .pre-commit-config.yaml .codespellrc .krazy .cmake-format .clang-format .clangd .clazy .clang-tidy .gitignore .mdlrc .mdlrc.rb .pep8 .pylintrc .editorconfig .shellcheckrc mkdocs.yml .github/workflows/mdbook.yml code.dev-*.code-workspace code.dev*.code-workspace vscode.code-workspace docs/api/Doxyfile.cmake distro/* *.yaml .github/workflows/pip-requirements.txt valgrind.sup +Files: .pre-commit-config.yaml .codespellrc .krazy .cmake-format .clang-format .clangd .clazy .clang-tidy .gitignore .markdownlint.json .pep8 .pylintrc .editorconfig .shellcheckrc mkdocs.yml .github/workflows/mdbook.yml code.dev-*.code-workspace code.dev*.code-workspace vscode.code-workspace docs/api/Doxyfile.cmake distro/* *.yaml .github/workflows/pip-requirements.txt valgrind.sup Copyright: Klarälvdalens Datakonsult AB, a KDAB Group company License: BSD-3-Clause