Fix merge conflicts

Author: BeyondEvil

.github/workflows/tests.yml

@@ -8,6 +8,7 @@ jobs:
     name: ${{ matrix.python-version }}
     runs-on: ubuntu-latest
     strategy:
+      fail-fast: false
       matrix:
         include:
           - tox-env: "py37"
@@ -64,7 +65,7 @@ jobs:
            # https://github.com/pytest-dev/pytest-html/issues/482
 #          - os: macOS-latest
 #            name: pypy3-mac
-#            python-version: pypy3
+#            python-version: pypy-3.8
 
           - tox-env: "devel"
             python-version: "3.11-dev"

.pre-commit-config.yaml

@@ -1,16 +1,16 @@
 repos:
   - repo: https://github.com/psf/black
-    rev: 20.8b1 # also bump this in Pipfile
+    rev: 22.3.0
     hooks:
       - id: black
         args: [--safe, --quiet]
   - repo: https://github.com/asottile/blacken-docs
-    rev: v1.7.0
+    rev: v1.12.1
     hooks:
       - id: blacken-docs
-        additional_dependencies: [black==20.8b1] # also bump this in Pipfile
+        additional_dependencies: [black==22.3.0]
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.1.0
+    rev: v4.1.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
@@ -19,21 +19,21 @@ repos:
       - id: check-yaml
       - id: debug-statements
         language_version: python3
-  - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.8.4 # also bump this in Pipfile
+  - repo: https://github.com/PyCQA/flake8
+    rev: 4.0.1
     hooks:
       - id: flake8
         language_version: python3
         additional_dependencies:
           - flake8-builtins==1.5.3
-          - flake8-typing-imports==1.9.0
+          - flake8-typing-imports==1.12.0
   - repo: https://github.com/asottile/reorder_python_imports
-    rev: v2.3.0
+    rev: v3.0.1
     hooks:
       - id: reorder-python-imports
         args: ["--application-directories=.:src:testing", --py3-plus]
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.4.4
+    rev: v2.32.0
     hooks:
       - id: pyupgrade
         args: [--py3-plus]

testing/legacy_test_pytest_html.py

@@ -823,7 +823,7 @@ def pytest_configure(config):
         "content,expected_content", _test_environment_list_value_data_set
     )
     def test_environment_list_value(self, testdir, content, expected_content):
-        expected_html_re = fr"<td>content</td>\n\s+<td>{expected_content}</td>"
+        expected_html_re = rf"<td>content</td>\n\s+<td>{expected_content}</td>"
         testdir.makeconftest(
             f"""
             def pytest_configure(config):

tox.ini

@@ -41,7 +41,7 @@ deps =
 
 [testenv:docs]
 # NOTE: The command for doc building was taken from readthedocs documentation
-#       See https://docs.readthedocs.io/en/stable/builds.html#understanding-what-s-going-on
+# See https://docs.readthedocs.io/en/stable/builds.html#understanding-what-s-going-on
 basepython = python
 changedir = docs
 deps = sphinx