From 0023e5bdcef04015479eab94574928801616f727 Mon Sep 17 00:00:00 2001 From: Hynek Schlawack Date: Thu, 17 Oct 2019 12:46:22 +0200 Subject: [PATCH] Ah, why not. pytest & tox are related --- pytest.ini | 7 ------- tox.ini | 9 +++++++++ 2 files changed, 9 insertions(+), 7 deletions(-) delete mode 100644 pytest.ini diff --git a/pytest.ini b/pytest.ini deleted file mode 100644 index cda68440..00000000 --- a/pytest.ini +++ /dev/null @@ -1,7 +0,0 @@ -[tool:pytest] -strict = true -addopts = -ra -testpaths = tests -filterwarnings = - once::Warning - ignore:::pympler[.*] diff --git a/tox.ini b/tox.ini index 75480fe4..92ab01ef 100644 --- a/tox.ini +++ b/tox.ini @@ -1,3 +1,12 @@ +[pytest] +strict = true +addopts = -ra +testpaths = tests +filterwarnings = + once::Warning + ignore:::pympler[.*] + + [tox] envlist = typing,lint,py27,py34,py35,py36,py37,py38,pypy,pypy3,manifest,docs,pypi-description,changelog,coverage-report isolated_build = True