Merge pull request pyca#380 from hynek/master

Add py.test settings
kiwigrid · Oct 24, 2015 · e59a8e8 · e59a8e8
2 parents 6160cb5 + d9fcd7a
commit e59a8e8
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/setup.cfg b/setup.cfg
@@ -1,3 +1,8 @@
+[pytest]
+minversion = 2.8.2
+strict = true
+norecursedirs = build dist .* *.egg doc _trial_temp
+
 [sdist]
 force_manifest=1
 

diff --git a/tox.ini b/tox.ini
@@ -7,7 +7,7 @@ whitelist_externals =
 passenv = ARCHFLAGS CFLAGS LC_ALL LDFLAGS PATH LD_LIBRARY_PATH TERM
 deps =
     coverage
-    pytest
+    pytest>=2.8.2
     cryptographyMaster: git+https://github.com/pyca/cryptography.git
 setenv =
     # Do not allow the executing environment to pollute the test environment