summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2017-05-23 12:24:26 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2017-05-23 12:24:26 -0400
commita987942761542666be89f40a9ac4a35e001b8265 (patch)
tree74011ca887439ce8aacd5d90c0c5fa8acd9a4f59
parent1d0067a873a8e701b5eb8246fa6a883521c76491 (diff)
downloadsqlalchemy-a987942761542666be89f40a9ac4a35e001b8265.tar.gz
- add option to disable py.test warnings plugin;
lift cap on py.test. references: https://github.com/pytest-dev/pytest/issues/2430 Change-Id: Ieb8a6258ba1d15efa570d9cda2b51cf021499a23
-rw-r--r--setup.cfg2
-rw-r--r--tox.ini2
2 files changed, 2 insertions, 2 deletions
diff --git a/setup.cfg b/setup.cfg
index d858a2435..f79060c54 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -9,7 +9,7 @@ first-package-wins = true
where = test
[tool:pytest]
-addopts= --tb native -v -r fxX --maxfail=25
+addopts= --tb native -v -r fxX --maxfail=25 -p no:warnings
python_files=test/*test_*.py
[upload]
diff --git a/tox.ini b/tox.ini
index 886b3fca1..3e3250a58 100644
--- a/tox.ini
+++ b/tox.ini
@@ -13,7 +13,7 @@ cov_args=--cov=sqlalchemy --cov-report term --cov-append --cov-report xml --excl
usedevelop=
cov: True
-deps=pytest<=3.0.7
+deps=pytest
pytest-xdist
mock
# needed only for correct profiling results