summaryrefslogtreecommitdiff
path: root/setup.cfg
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2015-02-25 08:54:00 -0500
committerJason R. Coombs <jaraco@jaraco.com>2015-02-25 08:54:00 -0500
commite0e40f0d2d0daf8ae43868a13f723602cd83b775 (patch)
treea9254f4f14141884e65e36e2dc87baf9772d3e57 /setup.cfg
parentddd14a2b2d993a66224b7021d424842daca77439 (diff)
downloadpython-setuptools-bitbucket-e0e40f0d2d0daf8ae43868a13f723602cd83b775.tar.gz
Move pytest config to pytest.ini (as it conflicts with the pytest-runner pytest command).
Diffstat (limited to 'setup.cfg')
-rwxr-xr-xsetup.cfg5
1 files changed, 1 insertions, 4 deletions
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