From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Tue, 23 May 2017 16:24:26 +0000 (-0400)
Subject: - add option to disable py.test warnings plugin;
X-Git-Tag: rel_1_2_0b1~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a987942761542666be89f40a9ac4a35e001b8265;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- 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
---

diff --git a/setup.cfg b/setup.cfg
index d858a24354..f79060c547 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 886b3fca19..3e3250a588 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