Commit 2ae8a40a by Qubad786

Fix travis and tox.

parent 610f43af
...@@ -6,8 +6,7 @@ env: ...@@ -6,8 +6,7 @@ env:
- TOXENV=django110 - TOXENV=django110
- TOXENV=django111 - TOXENV=django111
install: install:
- pip install -r requirements.txt - pip install tox
- pip install -r test-requirements.txt
- pip install coveralls - pip install coveralls
script: script:
- tox - tox
......
...@@ -3,4 +3,3 @@ ddt==0.8.0 ...@@ -3,4 +3,3 @@ ddt==0.8.0
django-nose==1.4.4 django-nose==1.4.4
mock==1.0.1 mock==1.0.1
pylint==1.3.0 pylint==1.3.0
tox==2.7.0
...@@ -3,10 +3,10 @@ envlist = django{18,110,111} ...@@ -3,10 +3,10 @@ envlist = django{18,110,111}
[testenv] [testenv]
deps = deps =
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
django18: Django>=1.8,<1.9 django18: Django>=1.8,<1.9
django110: Django>=1.10,<1.11 django110: Django>=1.10,<1.11
django111: Django>=1.11,<2 django111: Django>=1.11,<2
-r{toxinidir}/requirements.txt
-r{toxinidir}/test-requirements.txt
commands = commands =
python manage.py test {posargs} python manage.py test {posargs}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment