From 2df4f631490a3b12449ca1d8d192e53325b4f7d6 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sat, 7 Mar 2020 02:18:41 +0100 Subject: [PATCH 1/2] Add config for black (target-version) --- pyproject.toml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pyproject.toml b/pyproject.toml index 4ac1fd754..aa57762e7 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -54,3 +54,6 @@ template = "changelog/_template.rst" directory = "trivial" name = "Trivial/Internal Changes" showcontent = true + +[tool.black] +target-version = ['py35'] From dc86fb6758ff7eef43a4adcee46643dcd46c6671 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sat, 7 Mar 2020 01:40:48 +0100 Subject: [PATCH 2/2] pre-commit run --all-files --- src/_pytest/fixtures.py | 4 ++-- testing/test_capture.py | 2 +- testing/test_config.py | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/_pytest/fixtures.py b/src/_pytest/fixtures.py index cdd249d93..b39503f0e 100644 --- a/src/_pytest/fixtures.py +++ b/src/_pytest/fixtures.py @@ -1141,7 +1141,7 @@ def fixture( params=params, autouse=autouse, ids=ids, - name=name + name=name, ) scope = arguments.get("scope") params = arguments.get("params") @@ -1179,7 +1179,7 @@ def yield_fixture( params=params, autouse=autouse, ids=ids, - name=name + name=name, ) diff --git a/testing/test_capture.py b/testing/test_capture.py index 7396fd260..a3e558560 100644 --- a/testing/test_capture.py +++ b/testing/test_capture.py @@ -439,7 +439,7 @@ class TestCaptureFixture: out, err = capsys.readouterr() assert out.startswith("42") """, - *opt + *opt, ) reprec.assertoutcome(passed=1) diff --git a/testing/test_config.py b/testing/test_config.py index be728c0fc..9035407b7 100644 --- a/testing/test_config.py +++ b/testing/test_config.py @@ -702,7 +702,7 @@ def test_plugin_loading_order(testdir): config = session.config terminal_plugin.append(bool(config.pluginmanager.get_plugin("terminalreporter"))) """ - } + }, ) testdir.syspathinsert() result = testdir.runpytest("-p", "myplugin", str(p1)) @@ -781,7 +781,7 @@ def test_config_in_subdirectory_colon_command_line_issue2148(testdir): testdir.makefile( ".ini", - **{"pytest": "[pytest]\nfoo = root", "subdir/pytest": "[pytest]\nfoo = subdir"} + **{"pytest": "[pytest]\nfoo = root", "subdir/pytest": "[pytest]\nfoo = subdir"}, ) testdir.makepyfile(