From ef9f900e249bad1fae360c5ad109974c59e10422 Mon Sep 17 00:00:00 2001 From: Sebastian Vetter Date: Thu, 29 Aug 2013 14:12:50 +1000 Subject: [PATCH] Fix py.test command in travis --- .travis.yml | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/.travis.yml b/.travis.yml index 2aa9889..5bab284 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,19 +3,20 @@ python: - "2.7" env: matrix: - - DRF_VERSRION=">=2.0,<2.1" - - DRF_VERSRION=">=2.1,<2.2" - - DRF_VERSRION=">=2.2,<2.3" - - DRF_VERSRION=">=2.3,<2.4" - DJANGO_VERSION=">=1.4,<1.5" + OSCAR="django-oscar>=0.5,<0.6" + - DJANGO_VERSION=">=1.4,<1.5" + OSCAR="git+https://github.com/tangentlabs/django-oscar#egg=django-oscar-dev" + + - DJANGO_VERSION=">=1.5,<1.6" + OSCAR="django-oscar>=0.5,<0.6" - DJANGO_VERSION=">=1.5,<1.6" - - OSCAR="django-oscar>=0.5,<0.6" - - OSCAR="git@github.com:tangentlabs/django-oscar#egg=django-oscar-dev" + OSCAR="git+https://github.com/tangentlabs/django-oscar#egg=django-oscar-dev" install: - - pip install Django$DJANGO_VERSION djangorestframework$DRF_VERSION $OSCAR + - pip install Django$DJANGO_VERSION $OSCAR - pip install . --use-mirrors - pip install -r requirements.txt --use-mirrors script: - - py.test --pep8 --cov --pyargs fancypages -m 'not fp_only' + - py.test tests --pyargs fancypages -m 'not fp_only' --pep8 --cov oscar_fancypages after_success: - coveralls