summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2014-09-27 14:56:52 -0400
committerJason R. Coombs <jaraco@jaraco.com>2014-09-27 14:56:52 -0400
commit0e3631d088505ec827cfdd3ced3edf28f7dd0b1f (patch)
treee8e59ba8fbe657995c3e4a5612c7a4f132684151
parent9be62fef0123c1478702cc87cc661995279ee70e (diff)
downloadpython-setuptools-bitbucket-0e3631d088505ec827cfdd3ced3edf28f7dd0b1f.tar.gz
Move doctest directive and ignores to setup.cfg
-rw-r--r--.travis.yml3
-rwxr-xr-xsetup.cfg2
2 files changed, 2 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml
index b9690538..bc387f46 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -11,6 +11,5 @@ script:
# testing fix for https://bitbucket.org/hpk42/pytest/issue/555
- pip install --pre -i https://devpi.net/hpk/dev/ --upgrade pytest
- python setup.py test
- - python setup.py ptr --addopts='--doctest-modules --ignore release.py
- --ignore setuptools/lib2to3_ex.py'
+ - python setup.py ptr
- python ez_setup.py --version 5.4.1
diff --git a/setup.cfg b/setup.cfg
index 7f5fc796..74a172a4 100755
--- a/setup.cfg
+++ b/setup.cfg
@@ -21,5 +21,5 @@ formats = gztar zip
universal=1
[pytest]
-addopts=--ignore tests/manual_test.py --ignore tests/shlib_test
+addopts=--doctest-modules --ignore release.py --ignore setuptools/lib2to3_ex.py --ignore tests/manual_test.py --ignore tests/shlib_test
norecursedirs=dist build *.egg