From 20b8b45aeb4acd487b3cc4e588132a126110421d Mon Sep 17 00:00:00 2001 From: Luke Murphy Date: Mon, 13 May 2019 13:52:30 +0200 Subject: [PATCH] Remove all configuration from Tox file This puts tool configuration in their familiar and standard locations and simplifies the Tox configuration to just laying out the environments and factors. This also allows users who do not want to deal with overhead of Tox (for whatever reasons ...) to run pytest/black/etc. and have the same behaviour. --- pyproject.toml | 3 +++ setup.cfg | 8 ++++++++ tox.ini | 11 +++-------- 3 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 pyproject.toml diff --git a/pyproject.toml b/pyproject.toml new file mode 100644 index 0000000..10572da --- /dev/null +++ b/pyproject.toml @@ -0,0 +1,3 @@ +[tool.black] +line-length = 100 +skip-string-normalization = true diff --git a/setup.cfg b/setup.cfg index 12871ff..e26fdfc 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,2 +1,10 @@ [metadata] description-file=README.md + +[tool:pytest] +testpaths = tests +addopts = --cov-report term-missing:skip-covered --cov=borgmatic --ignore=tests/end-to-end + +[flake8] +ignore = E501,W503 +exclude = *.*/* diff --git a/tox.ini b/tox.ini index 3384636..4849312 100644 --- a/tox.ini +++ b/tox.ini @@ -8,21 +8,16 @@ usedevelop = True deps = -rtest_requirements.txt whitelist_externals = sh commands = - py.test --cov-report term-missing:skip-covered --cov=borgmatic --ignore=tests/end-to-end \ - tests [] + pytest sh scripts/black flake8 . [testenv:black] basepython = python3.7 commands = - black --skip-string-normalization --line-length 100 . + black . [testenv:end-to-end] deps = -rtest_requirements.txt commands = - py.test tests/end-to-end [] - -[flake8] -ignore = E501,W503 -exclude = *.*/* + pytest tests/end-to-end