updates tests configuration

force django version to 1.4 to allow 2.6 tests to work properly

Author: saxix

.travis.yml

@@ -10,7 +10,7 @@ python:
 
 install:
   - "pip install -e ."
-  - "pip install pytest django --use-mirrors"
+  - "pip install pytest 'django<=1.4' --use-mirrors"
 
 
 branches:

tox.ini

@@ -8,11 +8,12 @@ deps =  pytest
 
 commands =
     pip install -e {toxinidir}
-    py.test --junitxml={envlogdir}/junit-{envname}.xml {posargs:test_echo.py}
+    py.test --junitxml={envlogdir}/junit-{envname}.xml {posargs}
 
 [pytest]
 pep8ignore = E128 E302
     doc/conf.py ALL
+python_files=test_echo.py
 
 addopts =
         --tb=short