summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2019-05-15 21:21:57 -0400
committerJason R. Coombs <jaraco@jaraco.com>2019-05-15 21:24:53 -0400
commitd4c65e6784e783549bfe5bba1ccbc7be76eb41ff (patch)
tree9413c8a724b9525093bc1edaee2ae93246c1cdf8
parent4399038f2eab21f942a5462e0f5b1351e6203873 (diff)
downloadpytest-runner-d4c65e6784e783549bfe5bba1ccbc7be76eb41ff.tar.gz
Use pytest-black-multipy to enable simple support for pytest-black where available. Ref pytest-dev/pytest#5272.
-rw-r--r--pytest.ini2
-rw-r--r--setup.cfg2
-rw-r--r--tox.ini3
3 files changed, 3 insertions, 4 deletions
diff --git a/pytest.ini b/pytest.ini
index 9b3c1ec..10681ad 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,6 +1,6 @@
[pytest]
norecursedirs=dist build .tox .eggs
-addopts=--doctest-modules --flake8
+addopts=--doctest-modules --flake8 --black
doctest_optionflags=ALLOW_UNICODE ELLIPSIS
filterwarnings=
ignore:Possible nested set::pycodestyle:113
diff --git a/setup.cfg b/setup.cfg
index 235303f..9345869 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -29,7 +29,7 @@ testing =
pytest >= 3.5, !=3.7.3
pytest-checkdocs
pytest-flake8
- pytest-black; python_version >= "3"
+ pytest-black-multipy
# local
diff --git a/tox.ini b/tox.ini
index 8fa7966..8a3bf67 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,8 +8,7 @@ tox_pip_extensions_ext_venv_update = true
deps =
setuptools>=31.0.1
commands =
- !py27: pytest --black {posargs}
- py27: pytest {posargs}
+ pytest {posargs}
usedevelop = True
extras = testing