diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2015-02-25 08:54:00 -0500 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2015-02-25 08:54:00 -0500 |
| commit | eaeaf36088bccfcb35e798dcfa4ad187ef05f2f5 (patch) | |
| tree | c5aa67103f63ca3d4d68caf2a0a2f317d046371c | |
| parent | 34bd844443954929c7199e772e715ed6f0669332 (diff) | |
| download | external_python_setuptools-eaeaf36088bccfcb35e798dcfa4ad187ef05f2f5.tar.gz external_python_setuptools-eaeaf36088bccfcb35e798dcfa4ad187ef05f2f5.tar.bz2 external_python_setuptools-eaeaf36088bccfcb35e798dcfa4ad187ef05f2f5.zip | |
Move pytest config to pytest.ini (as it conflicts with the pytest-runner pytest command).
| -rwxr-xr-x | pytest.ini | 3 | ||||
| -rwxr-xr-x | setup.cfg | 5 |
2 files changed, 4 insertions, 4 deletions
diff --git a/pytest.ini b/pytest.ini new file mode 100755 index 00000000..91d64bb8 --- /dev/null +++ b/pytest.ini @@ -0,0 +1,3 @@ +[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 @@ -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 |