Merge branch 'master' into merge-master-into-features

Preparing for 3.0
This commit is contained in:
Bruno Oliveira
2016-08-17 22:39:23 -03:00
14 changed files with 210 additions and 58 deletions

View File

@@ -82,13 +82,12 @@ commands=
[testenv:py27-trial]
deps=twisted
commands=
pytest -rsxf {posargs:testing/test_unittest.py}
py.test -ra {posargs:testing/test_unittest.py}
[testenv:py35-trial]
platform=linux|darwin
deps={[testenv:py27-trial]deps}
commands=
pytest -rsxf {posargs:testing/test_unittest.py}
py.test -ra {posargs:testing/test_unittest.py}
[testenv:doctest]
commands=pytest --doctest-modules _pytest