Bump linters

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

Author: gaborbernat

.github/workflows/check.yml

@@ -10,48 +10,49 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  pre-commit:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
-      - uses: pre-commit/[email protected]
-
   test:
     name: test ${{ matrix.py }} - ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}-latest
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
-        os:
-          - Ubuntu
-          - Windows
-          - MacOs
         py:
-          - 3.10.0-beta.2
-          - 3.9
-          - 3.8
-          - 3.7
-          - 3.6
-          - pypy3
+          - "3.10"
+          - "pypy-3.7-v7.3.7"  # ahead to start it earlier because takes longer
+          - "3.9"
+          - "3.8"
+          - "3.7"
+        os:
+          - ubuntu-20.04
+          - windows-2022
+          - macos-10.15
+
     steps:
       - name: Setup python for tox
         uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: "3.10"
       - name: Install tox
         run: python -m pip install tox
       - uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
       - name: Setup python for test ${{ matrix.py }}
         uses: actions/setup-python@v2
         with:
           python-version: ${{ matrix.py }}
       - name: Pick environment to run
         run: |
-          import subprocess; import json; import os
-          major, minor, impl = json.loads(subprocess.check_output(["python", "-c", "import json; import sys; import platform; print(json.dumps([sys.version_info[0], sys.version_info[1], platform.python_implementation()]));"], universal_newlines=True))
-          with open(os.environ["GITHUB_ENV"], "a") as file_handler:
-                file_handler.write("TOXENV=" + (f'py{major}{minor}' if impl == "CPython" else f'pypy{major}') + "\n")
+          import codecs
+          import os
+          import platform
+          import sys
+          cpy = platform.python_implementation() == "CPython"
+          base =("{}{}{}" if cpy else "{}{}").format("py" if cpy else "pypy", *sys.version_info[0:2])
+          env = "TOXENV={}\n".format(base)
+          print("Picked:\n{}for{}".format(env, sys.version))
+          with codecs.open(os.environ["GITHUB_ENV"], "a", "utf-8") as file_handler:
+               file_handler.write(env)
         shell: python
       - name: Setup test suite
         run: tox -vv --notest
@@ -60,49 +61,53 @@ jobs:
         env:
           PYTEST_ADDOPTS: "-vv --durations=20"
           CI_RUN: "yes"
+          DIFF_AGAINST: HEAD
 
   check:
-    name: check ${{ matrix.tox_env }} - ${{ matrix.os }}
-    runs-on: ${{ matrix.os }}-latest
+    name: tox env ${{ matrix.tox_env }} - ${{ matrix.os }}
+    runs-on: ${{ matrix.os }}
     strategy:
       fail-fast: false
       matrix:
         os:
-          - Ubuntu
-          - Windows
+          - ubuntu-20.04
+          - windows-2022
         tox_env:
-          - type
           - dev
-          - pkg_desc
+          - type
+          - readme
         exclude:
-          - { os: Windows, tox_env: pkg_desc }
-
+          - { os: windows-latest, tox_env: readme }
     steps:
       - uses: actions/checkout@v2
-      - name: Setup python
+        with:
+          fetch-depth: 0
+      - name: Setup Python "3.10"
         uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: "3.10"
       - name: Install tox
         run: python -m pip install tox
-      - name: Run check for ${{ matrix.tox_env }}
-        run: python -m tox -e ${{ matrix.tox_env }}
-        env:
-          UPGRADE_ADVISORY: "yes"
+      - name: Setup test suite
+        run: tox -vv --notest -e ${{ matrix.tox_env }}
+      - name: Run test suite
+        run: tox --skip-pkg-install -e ${{ matrix.tox_env }}
 
   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.9
+          python-version: "3.10"
       - name: Install build
-        run: python -m pip install 'build>=0.4'
+        run: python -m pip install build
       - uses: actions/checkout@v2
-      - name: Build package
+        with:
+          fetch-depth: 0
+      - name: Build sdist and wheel
         run: python -m build -s -w . -o dist
       - name: Publish to PyPi
         uses: pypa/gh-action-pypi-publish@master

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.0.1
+    rev: v4.1.0
     hooks:
       - id: check-ast
       - id: check-builtin-literals
@@ -15,6 +15,7 @@ repos:
     rev: v2.29.1
     hooks:
       - id: pyupgrade
+        args: [ "--py36-plus" ]
   - repo: https://github.com/PyCQA/isort
     rev: 5.10.1
     hooks:
@@ -23,33 +24,35 @@ repos:
     rev: 21.12b0
     hooks:
       - id: black
+        args: [ --safe ]
   - repo: https://github.com/asottile/blacken-docs
     rev: v1.12.0
     hooks:
       - id: blacken-docs
-        additional_dependencies: [ black==21.6b0 ]
+        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/asottile/setup-cfg-fmt
-    rev: v1.20.0
-    hooks:
-      - id: setup-cfg-fmt
-        args: [--min-py3-version, "3.6", "--max-py-version", "3.10"]
   - repo: https://github.com/tox-dev/tox-ini-fmt
     rev: "0.5.1"
     hooks:
       - id: tox-ini-fmt
-        args: ["-p", "fix"]
+        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-unused-arguments == 0.0.6",
-            "flake8-comprehensions == 3.7.0",
-            "flake8-spellcheck == 0.24.0",
-            "flake8-pytest-style == 1.4.2",
-        ]
+        additional_dependencies:
+          - 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

README.md

@@ -6,7 +6,6 @@
 [![PyPI - Downloads](https://img.shields.io/pypi/dm/pytest-print?style=flat-square)](https://pypistats.org/packages/pytest-print)
 [![PyPI - License](https://img.shields.io/pypi/l/pytest-print?style=flat-square)](https://opensource.org/licenses/MIT)
 [![check](https://github.com/pytest-dev/pytest-print/workflows/check/badge.svg)](https://github.com/pytest-dev/pytest-print/actions?query=workflow%3Acheck)
-[![codecov](https://codecov.io/gh/pytest-dev/pytest-print/branch/master/graph/badge.svg)](https://codecov.io/gh/pytest-dev/pytest-print)
 [![Code style:
 black](https://img.shields.io/badge/code%20style-black-000000.svg?style=flat-square)](https://github.com/psf/black)
 

setup.cfg

@@ -20,7 +20,6 @@ classifiers =
     Operating System :: POSIX
     Programming Language :: Python :: 3
     Programming Language :: Python :: 3 :: Only
-    Programming Language :: Python :: 3.6
     Programming Language :: Python :: 3.7
     Programming Language :: Python :: 3.8
     Programming Language :: Python :: 3.9
@@ -37,7 +36,7 @@ project_urls =
 packages = find:
 install_requires =
     pytest>=6
-python_requires = >=3.6
+python_requires = >=3.7
 include_package_data = True
 package_dir =
     =src

tox.ini

@@ -8,7 +8,7 @@ envlist =
     py36
     pypy3
     type
-    pkg_desc
+    readme
 isolated_build = true
 skip_missing_interpreters = true
 minversion = 3.21
@@ -51,12 +51,12 @@ description = run type check on code base
 setenv =
     {tty:MYPY_FORCE_COLOR = 1}
 deps =
-    mypy==0.902
+    mypy==0.930
 commands =
     mypy src/pytest_print
     mypy tests
 
-[testenv:pkg_desc]
+[testenv:readme]
 description = check that the long description is valid
 skip_install = true
 deps =