Merge branch 'develop' into style-override-on-windows

.pre-commit-config.yaml

@@ -36,7 +36,7 @@ repos:
       - id: end-of-file-fixer
       - id: trailing-whitespace
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.29.1
+    rev: v2.30.1
     hooks:
       - id: pyupgrade
   - repo: https://github.com/psf/black
@@ -66,6 +66,22 @@ repos:
     hooks:
       - id: prettier
         stages: [commit]
+  - repo: https://github.com/myint/autoflake
+    rev: v1.4
+    hooks:
+      - id: autoflake
+        name: autoflake
+        language: python
+        args:
+          [
+            --in-place,
+            --remove-all-unused-imports,
+            --remove-unused-variables,
+            --remove-duplicate-keys,
+            --ignore-init-module-imports,
+            --exclude,
+            compat.py,
+          ]
   - repo: https://github.com/PyCQA/flake8
     rev: 4.0.1
     hooks:
@@ -88,6 +104,10 @@ repos:
     rev: v0.930
     hooks:
       - id: mypy
+        args: [
+            # https://mypy.readthedocs.io/en/stable/command_line.html#cmdoption-mypy-show-error-codes
+            --show-error-codes,
+          ]
         # Install additional types to fix new warnings that appeared on v0.910:
         # https://mypy.readthedocs.io/en/stable/running_mypy.html#missing-imports
         # "using --install-types is problematic"

.prettierignore

@@ -3,3 +3,6 @@ index.html
 _includes/*
 *.min.css
 README.md
+
+# Prettier uses double quotes, ruamel.yaml uses single quotes
+tests/test_yaml/*.yaml

.pylintrc

@@ -30,7 +30,7 @@ output-format=colorized
 # --disable=W"
 # Configurations for the black formatter
 disable=bad-continuation,bad-whitespace,
-    fixme,cyclic-import
+    fixme,cyclic-import,line-too-long
 
 [BASIC]
 

Makefile

@@ -3,7 +3,7 @@
 
 SRC := $(shell find docs src -type f -a -iname '*.py')
 DOCS := docs/*.rst *.rst *.md
-STYLES := $(shell find styles -type f)
+STYLES := $(shell find src/nitpick/resources -type f)
 TESTS := $(shell find tests -type f -iname '*.py')
 GITHUB = $(shell find .github -type f)
 ANY := $(SRC) $(DOCS) $(STYLES) $(TESTS) $(GITHUB)

README.rst

@@ -109,6 +109,9 @@ Implemented
    * - `Any TOML file <https://nitpick.rtfd.io/en/latest/plugins.html#toml-files>`_
      - ✅
      - ✅
+   * - `Any YAML file (except .pre-commit-config.yaml) <https://nitpick.rtfd.io/en/latest/plugins.html#yaml-files>`_
+     - ✅
+     - ✅
    * - `.editorconfig <https://nitpick.rtfd.io/en/latest/examples.html#example-editorconfig>`_
      - ✅
      - ✅
@@ -232,8 +235,6 @@ Run as a pre-commit hook
 If you use `pre-commit <https://pre-commit.com/>`_ on your project, add
 this to the ``.pre-commit-config.yaml`` in your repository::
 
-.. code-block:: yaml
-
     repos:
       - repo: https://github.com/andreoliwa/nitpick
         rev: v0.29.0
@@ -247,8 +248,6 @@ There are 3 available hook IDs:
 
 If you want to run Nitpick as a flake8 plugin instead::
 
-.. code-block:: yaml
-
     repos:
       - repo: https://github.com/PyCQA/flake8
         rev: 4.0.1

docs/conf.py

@@ -112,7 +112,7 @@
     (key, identifier)
     for key, identifiers in {
         "py:class": {
-            "BaseFormat",
+            "BaseDoc",
             "bool|tuple",
             "builtins.dict",
             "callable",