Permalink
Browse files

Separate standalone and oscar tests on travis

  • Loading branch information...
1 parent 0e2c1c6 commit 89cb5d62be810f1d259db51325d874b718f915e8 @elbaschid elbaschid committed with elbaschid Jun 24, 2014
Showing with 24 additions and 10 deletions.
  1. +20 −5 .travis.yml
  2. +1 −5 Makefile
  3. +3 −0 requirements_oscar.txt
View
@@ -1,26 +1,41 @@
language: python
+
python:
- '2.7'
+
addons:
sauce_connect: true
+
env:
global:
- secure: "IFkU1stTDt34cs+BtuGulzogobPzQvO0MWMHDWT5cY4hWrFzxShZbcGueRQCvbyjrEiY2vQ0VX6KCYxUj9neNz90tbW2P9cCURrielkPRVhHorD8ngOtSeknLyzw0UjcBPwigszkFskoqRLPG7p8sa+RJvA+qEsbPr1Jfs0tEgA="
- secure: "fUdKTZ+nB29tQzKTs5/UnxUc2rm3fkIR31vcm0wFDGhdqMu5K+eZss0qXLrQ7s13JUB8POk8C2juuzJFPiM5yiR1Euhp6RddU6UqLnCaqkV9RH4Y7PjmfpSBgJKi2pOIneRngoOBI0kG6iWjK6f3D7Bb8c94bLbU3ZwGxQLoSkI="
- PYTEST_OPTS="--pep8 --cov fancypages"
+
matrix:
- - DJANGO="Django>=1.4,<1.5" MODEL_UTILS_VERSION=">2.0"
- - DJANGO="Django>=1.5,<1.6" MODEL_UTILS_VERSION="==1.5"
- - DJANGO="Django>=1.6,<1.7" MODEL_UTILS_VERSION=">2.0"
- - DJANGO="https://github.com/django/django/archive/1.7b4.zip" MODEL_UTILS_VERSION=">2.0"
+ - DJANGO="Django>=1.4,<1.5" MODEL_UTILS_VERSION=">2.0" TARGET='test-fancypages'
+ - DJANGO="Django>=1.4,<1.5" MODEL_UTILS_VERSION=">2.0" TARGET='test-oscar-fancypages'
+
+ - DJANGO="Django>=1.6,<1.7" MODEL_UTILS_VERSION=">2.0" TARGET='test-fancypages'
+ - DJANGO="Django>=1.5,<1.6" MODEL_UTILS_VERSION="==1.5" TARGET='test-oscar-fancypages'
+
+ - DJANGO="Django>=1.6,<1.7" MODEL_UTILS_VERSION=">2.0" TARGET='test-fancypages'
+ - DJANGO="Django>=1.6,<1.7" MODEL_UTILS_VERSION=">2.0" TARGET='test-oscar-fancypages'
+
+ - DJANGO="https://github.com/django/django/archive/1.7b4.zip" MODEL_UTILS_VERSION=">2.0" TARGET='test-fancypages'
+ - DJANGO="https://github.com/django/django/archive/1.7b4.zip" MODEL_UTILS_VERSION=">2.0" TARGET='test-oscar-fancypages'
+
# We run the browser tests only once to save a bit of time
- PYTEST_OPTS="-m browser"
+
install:
- pip install wheel setuptools -U
- pip install $DJANGO django-model-utils$MODEL_UTILS_VERSION --use-wheel
- pip install . --use-wheel
- pip install -r requirements.txt --use-wheel
+
script:
- - make travis
+ - make $TARGET
+
after_success:
- coveralls
View
@@ -18,15 +18,11 @@ compile-static:
tests: test-fancypages test-oscar-fancypages test-migration-sqlite
-travis:
- ${MAKE} test-fancypages
- pip install -r requirements_oscar.txt
- ${MAKE} test-oscar-fancypages
-
test-fancypages:
py.test ${PYTEST_OPTS}
test-oscar-fancypages:
+ pip install -r requirements_oscar.txt
USE_OSCAR_SANDBOX=true py.test ${PYTEST_OPTS}
test-migration-sqlite:
View
@@ -1 +1,4 @@
django-oscar>=0.6.3
+
+# for Django 1.7 we need to ensure the latest version of sorl-thumbnail
+sorl-thumbnail==11.12.1b

0 comments on commit 89cb5d6

Please sign in to comment.