diff options
| -rw-r--r-- | .travis.yml | 15 | ||||
| -rw-r--r-- | tests/pytest.ini | 2 | ||||
| -rw-r--r-- | tox.ini | 2 |
3 files changed, 11 insertions, 8 deletions
diff --git a/.travis.yml b/.travis.yml index e4add334..a581f816 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,10 +1,11 @@ language: python -env: - - TOX_ENV=py26 - - TOX_ENV=py27 - - TOX_ENV=py33 - - TOX_ENV=py34 +python: + - "2.6" + - "2.7" + - "3.3" + - "3.4" -install: pip install tox +install: + - pip install . pytest mock -script: tox -e $TOX_ENV +script: py.test diff --git a/tests/pytest.ini b/tests/pytest.ini new file mode 100644 index 00000000..f7877405 --- /dev/null +++ b/tests/pytest.ini @@ -0,0 +1,2 @@ +[pytest] +addopts=--capture=sys --showlocals
\ No newline at end of file @@ -3,4 +3,4 @@ envlist = py26, py27, py33, py34 [testenv] deps = pytest mock -commands = py.test --capture=sys --showlocals +commands = py.test |