Merge branch 'fix-ci' into wheels

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.2.3
+    rev: v4.0.1
     hooks:
     -   id: check-added-large-files
     -   id: check-docstring-first
@@ -11,32 +11,33 @@ repos:
     -   id: detect-private-key
     -   id: double-quote-string-fixer
     -   id: end-of-file-fixer
-    -   id: flake8
     -   id: name-tests-test
     -   id: requirements-txt-fixer
     -   id: trailing-whitespace
-    -   id: fix-encoding-pragma
-        args: ['--remove']
 -   repo: https://github.com/pre-commit/mirrors-autopep8
-    rev: v1.4.4
+    rev: v1.5.7
     hooks:
     -   id: autopep8
+-   repo: https://github.com/pycqa/flake8
+    rev: 4.0.1
+    hooks:
+    -   id: flake8
 -   repo: https://github.com/asottile/reorder_python_imports
-    rev: v1.6.0
+    rev: v2.6.0
     hooks:
     -   id: reorder-python-imports
         args: ['--py3-plus']
 -   repo: https://github.com/Lucas-C/pre-commit-hooks
-    rev: v1.1.6
+    rev: v1.1.10
     hooks:
     -   id: remove-tabs
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v1.21.0
+    rev: v2.29.0
     hooks:
     -   id: pyupgrade
         args: ['--py3-plus']
 -   repo: https://github.com/asottile/add-trailing-comma
-    rev: v1.4.1
+    rev: v2.1.0
     hooks:
     -   id: add-trailing-comma
         args: ['--py36-plus']

requirements-dev.txt

@@ -1,3 +1,6 @@
 pre-commit>=0.5.0
 pytest
-pytest-timeout
+# TODO: This pin is to work around an issue where the system pytest is too old.
+# We should fix this by not depending on the system pytest/python packages at
+# some point.
+pytest-timeout<2.0.0