Merge branch '3.0.x'

diff --cc .pre-commit-config.yaml
index 39806ed635a905749f24c7f8ad4a37c36ce2b1fd,85c0e28ff346e97db45699272be6f851c7731cac..1c751490bcfd04443956f11d148a6cfa1f0fea2f
--- 1/.pre-commit-config.yaml
--- 2/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@@ -2,10 -2,10 +2,10 @@@ ci
    autoupdate_schedule: monthly
  repos:
    - repo: https://github.com/asottile/pyupgrade
-     rev: v2.29.1
+     rev: v2.31.0
      hooks:
        - id: pyupgrade
 -        args: ["--py36-plus"]
 +        args: ["--py37-plus"]
    - repo: https://github.com/asottile/reorder_python_imports
      rev: v2.6.0
      hooks: