Fixed issue with GitHub zips and pip.

Also seperated 1.8.x and master test envs.
This commit is contained in:
Jannis Leidel 2015-03-25 14:48:13 +01:00
parent b92d7c0ca5
commit 2ab0fd2686
2 changed files with 8 additions and 2 deletions

View File

@ -5,11 +5,15 @@ script:
- tox
env:
- TOXENV=py27-django-17
- TOXENV=py27-django-18
- TOXENV=py27-django-master
- TOXENV=py32-django-17
- TOXENV=py32-django-18
- TOXENV=py32-django-master
- TOXENV=py33-django-17
- TOXENV=py33-django-18
- TOXENV=py33-django-master
- TOXENV=py34-django-17
- TOXENV=py34-django-18
- TOXENV=py34-django-master
after_success: coveralls

View File

@ -1,6 +1,6 @@
[tox]
args_are_paths = false
envlist = {py27,py32,py33,py34}-django-{17,master}
envlist = {py27,py32,py33,py34}-django-{17,18,master}
[testenv]
basepython =
@ -11,7 +11,9 @@ basepython =
usedevelop = true
whitelist_externals = make
commands = make test
pip_pre = true
deps =
django-17: Django>=1.7,<1.8
django-master: https://github.com/django/django/archive/master.zip
django-18: Django<1.9
django-master: https://github.com/django/django/archive/master.tar.gz
-r{toxinidir}/tests/requirements.txt