Bump CI linters and use pre-commit.ci over GHA

Signed-off-by: Bernát Gábor <[email protected]>

Author: gaborbernat

.github/workflows/check.yml

@@ -10,31 +10,22 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  pre-commit:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v1
-      - uses: actions/setup-python@v1
-      - uses: pre-commit/[email protected]
-
   test:
-    name: test ${{ matrix.py }} - ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}-latest
+    name: test on CPython ${{ matrix.py }}
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
-        os:
-          - Ubuntu
         py:
-          - 3.10.0-rc.2
+          - "3.10"
           - 3.9
           - 3.8
           - 3.7
     steps:
       - name: setup python for tox
         uses: actions/setup-python@v2
         with:
-          python-version: 3.10.0-rc.2
+          python-version: "3.10"
       - name: install tox
         run: python -m pip install tox
       - uses: actions/checkout@v2
@@ -59,23 +50,21 @@ jobs:
           DIFF_AGAINST: HEAD
 
   check:
-    name: check ${{ matrix.tox_env }} - ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}-latest
+    name: tox env ${{ matrix.tox_env }}
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
-        os:
-          - Ubuntu
         tox_env:
           - type
           - dev
           - pkg_check
     steps:
       - uses: actions/checkout@v2
-      - name: setup Python 3.10.0-rc.2
+      - name: setup Python 3.10
         uses: actions/setup-python@v2
         with:
-          python-version: 3.10.0-rc.2
+          python-version: "3.10"
       - name: install tox
         run: python -m pip install tox
       - name: run check for ${{ matrix.tox_env }}
@@ -85,13 +74,13 @@ jobs:
 
   publish:
     if: github.event_name == 'push' && startsWith(github.ref, 'refs/tags')
-    needs: [check, test, pre-commit]
-    runs-on: ubuntu-latest
+    needs: [check, test]
+    runs-on: ubuntu-20.04
     steps:
       - name: setup python to build package
         uses: actions/setup-python@v2
         with:
-          python-version: 3.10.0-rc.2
+          python-version: "3.10"
       - name: install build
         run: python -m pip install build
       - uses: actions/checkout@v2

.pre-commit-config.yaml

@@ -2,17 +2,20 @@ repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.1.0
     hooks:
+      - id: check-ast
       - id: check-builtin-literals
       - id: check-docstring-first
+      - id: check-merge-conflict
       - id: check-yaml
       - id: check-toml
       - id: debug-statements
       - id: end-of-file-fixer
       - id: trailing-whitespace
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.29.1
+    rev: v2.30.0
     hooks:
       - id: pyupgrade
+        args: [ "--py36-plus" ]
   - repo: https://github.com/PyCQA/isort
     rev: 5.10.1
     hooks:
@@ -21,25 +24,35 @@ repos:
     rev: 21.12b0
     hooks:
       - id: black
-        args: [--safe]
-  - repo: https://github.com/asottile/setup-cfg-fmt
-    rev: v1.20.0
+        args: [ --safe ]
+  - repo: https://github.com/asottile/blacken-docs
+    rev: v1.12.0
     hooks:
-      - id: setup-cfg-fmt
-        args: ["--max-py-version", "3.10"]
+      - id: blacken-docs
+        additional_dependencies: [ black==21.12b0 ]
+  - repo: https://github.com/pre-commit/pygrep-hooks
+    rev: v1.9.0
+    hooks:
+      - id: rst-backticks
   - repo: https://github.com/tox-dev/tox-ini-fmt
     rev: "0.5.1"
     hooks:
       - id: tox-ini-fmt
+        args: [ "-p", "fix" ]
+  - repo: https://github.com/asottile/setup-cfg-fmt
+    rev: v1.20.0
+    hooks:
+      - id: setup-cfg-fmt
+        args: [ --min-py3-version, "3.7", "--max-py-version", "3.10" ]
   - repo: https://github.com/PyCQA/flake8
-    rev: "4.0.1"
+    rev: 4.0.1
     hooks:
       - id: flake8
         additional_dependencies:
-        - flake8-bugbear==21.9.2
-        - flake8-comprehensions==3.7
-        - flake8-pytest-style==1.5
-        - flake8-spellcheck==0.24
-        - flake8-unused-arguments==0.0.7
-        - flake8-noqa==1.2
-        - pep8-naming==0.12.1
+          - flake8-bugbear==21.11.29
+          - flake8-comprehensions==3.7
+          - flake8-pytest-style==1.6
+          - flake8-spellcheck==0.24
+          - flake8-unused-arguments==0.0.9
+          - flake8-noqa==1.2.1
+          - pep8-naming==0.12.1

codecov.yml

@@ -49,8 +49,8 @@ where = src
 
 [options.extras_require]
 test =
-    pytest>=4
-    pytest-cov>=2.7
+    pytest>=6
+    pytest-cov>=3
 
 [options.package_data]
 sphinx_argparse_cli = py.typed
@@ -86,7 +86,6 @@ source =
 [coverage:run]
 branch = true
 parallel = true
-dynamic_context = test_function
 source =
     ${_COVERAGE_SRC}
 

setup.cfg

@@ -102,7 +102,7 @@ def load_sub_parsers(self) -> Iterator[tuple[list[str], str, ArgumentParser]]:
             return
         parser_to_args: dict[int, list[str]] = defaultdict(list)
         str_to_parser: dict[str, ArgumentParser] = {}
-        sub_parser = cast(_SubParsersAction, top_sub_parser._group_actions[0])
+        sub_parser: _SubParsersAction[ArgumentParser] = top_sub_parser._group_actions[0]  # type: ignore
         for key, parser in sub_parser._name_parser_map.items():
             parser_to_args[id(parser)].append(key)
             str_to_parser[key] = parser

src/sphinx_argparse_cli/_logic.py

@@ -1,10 +1,10 @@
 [tox]
 envlist =
+    fix
     py310
     py39
     py38
     py37
-    fix
     type
     pkg_check
 isolated_build = true
@@ -34,7 +34,7 @@ description = run static analysis and style check using flake8
 passenv =
     HOMEPATH
     PROGRAMDATA
-basepython = python3.9
+basepython = python3.10
 skip_install = true
 deps =
     pre-commit>=2
@@ -47,29 +47,29 @@ description = run type check on code base
 setenv =
     {tty:MYPY_FORCE_COLOR = 1}
 deps =
-    mypy==0.910
+    mypy==0.930
     types-docutils
 commands =
-    mypy --strict --python-version 3.9 src
-    mypy --strict --python-version 3.9 tests
+    mypy --strict --python-version 3.10 src
+    mypy --strict --python-version 3.10 tests
 
 [testenv:pkg_check]
 description = check that the long description is valid
 passenv =
     *
-basepython = python3.9
+basepython = python3.10
 skip_install = true
 deps =
-    build>=0.1
-    twine>=3.2
+    build>=0.7
+    twine>=3.7
 changedir = {toxinidir}
 commands =
     python -m build --sdist --wheel -o {envtmpdir} .
     twine check {envtmpdir}/*
 
 [testenv:dev]
 description = generate a DEV environment
-basepython = python3.9
+basepython = python3.10
 usedevelop = true
 extras =
     docs