Fix problem with travis not using correct python versions when testing.

2015-01-09 12:23:05 +02:00 · 2015-01-09 12:23:05 +02:00 · b54823c96a
parent 9a6292170b
commit b54823c96a
3 changed files with 11 additions and 8 deletions
--- 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
--- a/tests/pytest.ini
+++ b/tests/pytest.ini
@ -0,0 +1,2 @@
+[pytest]
+addopts=--capture=sys --showlocals
--- a/tox.ini
+++ b/tox.ini
@ -3,4 +3,4 @@ envlist = py26, py27, py33, py34
 [testenv]
 deps = pytest
    mock
-commands = py.test --capture=sys --showlocals
+commands = py.test