Merge pull request #7120 from bluetech/update-dev

pre-commit: update some tool revisions

.pre-commit-config.yaml

@@ -5,12 +5,12 @@ repos:
     -   id: black
         args: [--safe, --quiet]
 -   repo: https://github.com/asottile/blacken-docs
-    rev: v1.0.0
+    rev: v1.6.0
     hooks:
     -   id: blacken-docs
         additional_dependencies: [black==19.10b0]
 -   repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v2.2.3
+    rev: v2.5.0
     hooks:
     -   id: trailing-whitespace
     -   id: end-of-file-fixer
@@ -32,7 +32,7 @@ repos:
     -   id: reorder-python-imports
         args: ['--application-directories=.:src', --py3-plus]
 -   repo: https://github.com/asottile/pyupgrade
-    rev: v1.18.0
+    rev: v2.2.1
     hooks:
     -   id: pyupgrade
         args: [--py3-plus]

src/_pytest/capture.py

@@ -505,7 +505,7 @@ class FDCaptureBinary:
             self.done = self._done
             if targetfd == 0:
                 assert not tmpfile, "cannot set tmpfile with stdin"
-                tmpfile = open(os.devnull, "r")
+                tmpfile = open(os.devnull)
                 self.syscapture = SysCapture(targetfd)
             else:
                 if tmpfile is None:
@@ -580,7 +580,7 @@ class FDCapture(FDCaptureBinary):
     """
 
     # Ignore type because it doesn't match the type in the superclass (bytes).
-    EMPTY_BUFFER = str()  # type: ignore
+    EMPTY_BUFFER = ""  # type: ignore
 
     def snap(self):
         self.tmpfile.seek(0)
@@ -651,7 +651,7 @@ class SysCaptureBinary:
 
 
 class SysCapture(SysCaptureBinary):
-    EMPTY_BUFFER = str()  # type: ignore[assignment]  # noqa: F821
+    EMPTY_BUFFER = ""  # type: ignore[assignment]  # noqa: F821
 
     def snap(self):
         res = self.tmpfile.getvalue()

src/_pytest/mark/__init__.py

@@ -27,10 +27,10 @@ def param(*values, **kw):
 
     .. code-block:: python
 
-        @pytest.mark.parametrize("test_input,expected", [
+        @pytest.mark.parametrize(
-            ("3+5", 8),
+            "test_input,expected",
-            pytest.param("6*9", 42, marks=pytest.mark.xfail),
+            [("3+5", 8), pytest.param("6*9", 42, marks=pytest.mark.xfail),],
-        ])
+        )
         def test_eval(test_input, expected):
             assert eval(test_input) == expected
 

src/_pytest/monkeypatch.py

@@ -117,6 +117,8 @@ class MonkeyPatch:
         .. code-block:: python
 
             import functools
+
+
             def test_partial(monkeypatch):
                 with monkeypatch.context() as m:
                     m.setattr(functools, "partial", 3)

src/_pytest/pytester.py

@@ -1202,8 +1202,8 @@ class Testdir:
         finally:
             f1.close()
             f2.close()
-        f1 = open(str(p1), "r", encoding="utf8")
+        f1 = open(str(p1), encoding="utf8")
-        f2 = open(str(p2), "r", encoding="utf8")
+        f2 = open(str(p2), encoding="utf8")
         try:
             out = f1.read().splitlines()
             err = f2.read().splitlines()

testing/acceptance_test.py

@@ -1339,7 +1339,7 @@ def test_tee_stdio_captures_and_live_prints(testdir):
     result.stderr.fnmatch_lines(["*@this is stderr@*"])
 
     # now ensure the output is in the junitxml
-    with open(os.path.join(testdir.tmpdir.strpath, "output.xml"), "r") as f:
+    with open(os.path.join(testdir.tmpdir.strpath, "output.xml")) as f:
         fullXml = f.read()
     assert "@this is stdout@\n" in fullXml
     assert "@this is stderr@\n" in fullXml

testing/logging/test_reporting.py

@@ -1103,11 +1103,11 @@ def test_log_set_path(testdir):
         """
     )
     testdir.runpytest()
-    with open(os.path.join(report_dir_base, "test_first"), "r") as rfh:
+    with open(os.path.join(report_dir_base, "test_first")) as rfh:
         content = rfh.read()
         assert "message from test 1" in content
 
-    with open(os.path.join(report_dir_base, "test_second"), "r") as rfh:
+    with open(os.path.join(report_dir_base, "test_second")) as rfh:
         content = rfh.read()
         assert "message from test 2" in content
 

testing/test_capture.py

@@ -1401,14 +1401,14 @@ def test_global_capture_with_live_logging(testdir):
     result = testdir.runpytest_subprocess("--log-cli-level=INFO")
     assert result.ret == 0
 
-    with open("caplog", "r") as f:
+    with open("caplog") as f:
         caplog = f.read()
 
     assert "fix setup" in caplog
     assert "something in test" in caplog
     assert "fix teardown" in caplog
 
-    with open("capstdout", "r") as f:
+    with open("capstdout") as f:
         capstdout = f.read()
 
     assert "fix setup" in capstdout