Merge branch '3.0.x' into get-or-404-type

Author: pamelafox

.pre-commit-config.yaml

@@ -3,11 +3,11 @@ ci:
   autoupdate_schedule: monthly
 repos:
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.3.2
+    rev: v3.4.0
     hooks:
       - id: pyupgrade
         args: ["--py37-plus"]
-  - repo: https://github.com/asottile/reorder_python_imports
+  - repo: https://github.com/asottile/reorder-python-imports
     rev: v3.9.0
     hooks:
       - id: reorder-python-imports