From eaeaf36088bccfcb35e798dcfa4ad187ef05f2f5 Mon Sep 17 00:00:00 2001
From: "Jason R. Coombs" <jaraco@jaraco.com>
Date: Wed, 25 Feb 2015 08:54:00 -0500
Subject: Move pytest config to pytest.ini (as it conflicts with the
 pytest-runner pytest command).

---
 setup.cfg | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

(limited to 'setup.cfg')

diff --git a/setup.cfg b/setup.cfg
index 5937edd0..a6da2c77 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -5,6 +5,7 @@ tag_build = dev
 release = egg_info -RDb ''
 source = register sdist binary
 binary = bdist_egg upload --show-response
+test = pytest
 
 [build_sphinx]
 source-dir = docs/
@@ -19,7 +20,3 @@ formats = gztar zip
 
 [wheel]
 universal=1
-
-[pytest]
-addopts=--doctest-modules --ignore release.py --ignore setuptools/lib2to3_ex.py --ignore tests/manual_test.py --ignore tests/shlib_test --doctest-glob=pkg_resources/api_tests.txt
-norecursedirs=dist build *.egg
-- 
cgit v1.2.1