1 new commit in pytest: https://bitbucket.org/hpk42/pytest/commits/e3309a39fb91/ Changeset: e3309a39fb91 User: hpk42 Date: 2014-04-02 12:48:35 Summary: fix issue493: don't run tests in doc directory with ``python setup.py test`` (use tox -e doctesting for that) Affected #: 3 files
diff -r 565d840023be5a4c59135be1a11b7bca2a97b663 -r e3309a39fb919391d0e9d9cb0e7fc7e75b7162e7 CHANGELOG --- a/CHANGELOG +++ b/CHANGELOG @@ -42,6 +42,9 @@ - fix issue492: avoid leak in test_writeorg. Thanks Marc Abramowitz. +- fix issue493: don't run tests in doc directory with ``python setup.py test`` + (use tox -e doctesting for that) + 2.5.2 ----------------------------------- diff -r 565d840023be5a4c59135be1a11b7bca2a97b663 -r e3309a39fb919391d0e9d9cb0e7fc7e75b7162e7 setup.py --- a/setup.py +++ b/setup.py @@ -75,7 +75,7 @@ PPATH=[x for x in os.environ.get("PYTHONPATH", "").split(":") if x] PPATH.insert(0, os.getcwd()) os.environ["PYTHONPATH"] = ":".join(PPATH) - errno = subprocess.call([sys.executable, 'pytest.py']) + errno = subprocess.call([sys.executable, 'pytest.py', '--ignore=doc']) raise SystemExit(errno) if __name__ == '__main__': diff -r 565d840023be5a4c59135be1a11b7bca2a97b663 -r e3309a39fb919391d0e9d9cb0e7fc7e75b7162e7 tox.ini --- a/tox.ini +++ b/tox.ini @@ -1,6 +1,6 @@ [tox] distshare={homedir}/.tox/distshare -envlist=flakes,py26,py27,pypy,py27-pexpect,py33-pexpect,py27-nobyte,py32,py33,py27-xdist,py33-xdist,py27-trial,py33-trial +envlist=flakes,py26,py27,pypy,py27-pexpect,py33-pexpect,py27-nobyte,py32,py33,py27-xdist,py33-xdist,py27-trial,py33-trial,doctesting [testenv] changedir=testing @@ -92,6 +92,12 @@ make clean make html +[testenv:doctesting] +basepython=python3.3 +changedir=doc/en +deps=PyYAML +commands= py.test -rfsxX --junitxml={envlogdir}/junit-{envname}.xml [] + [testenv:regen] basepython=python changedir=doc/en Repository URL: https://bitbucket.org/hpk42/pytest/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email. _______________________________________________ pytest-commit mailing list pytest-commit@python.org https://mail.python.org/mailman/listinfo/pytest-commit