Merge remote-tracking branch 'upstream/master' into merge-master-into-features

# Conflicts: # _pytest/capture.py # _pytest/compat.py # _pytest/python.py # testing/python/collect.py # testing/test_mark.py
2017-05-03 19:04:53 -03:00
parent cccb2cc92b 3fc917a261
commit f3b359f5b8
23 changed files with 327 additions and 99 deletions
--- a/tox.ini
+++ b/tox.ini
@@ -109,6 +109,8 @@ commands=
  pytest -ra {posargs:testing/test_unittest.py}

 [testenv:docs]
+skipsdist=True
+usedevelop=True
 basepython=python
 changedir=doc/en
 deps=