Merge https://github.com/jaraco/skeleton

jaraco · May 16, 2019 · f29aa0f · f29aa0f
2 parents 7885683 + d4c65e6
commit f29aa0f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git 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
@@ -30,7 +30,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
@@ -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