Update travis to run the tests via tox

.gitignore

@@ -29,6 +29,7 @@ TODO
 
 # Test files
 .coverage
+.coverage\.*
 .noseids
 coverage.xml
 violations.txt

.travis.yml

@@ -1,57 +1,77 @@
-# Use the newer container-based infrastructure
-# http://docs.travis-ci.com/user/workers/container-based-infrastructure/
 sudo: false
-
 language: python
 
-python:
-    - 2.7
-    - 3.3
-    - 3.4
-    - 3.5
+matrix:
+  include:
+    - python: 2.7
+      env: TOXENV=py27-django18
+    - python: 2.7
+      env: TOXENV=py27-django19
+    - python: 2.7
+      env: TOXENV=py27-django110
+    - python: 3.3
+      env: TOXENV=py33-django18
+    - python: 3.4
+      env: TOXENV=py34-django18
+    - python: 3.4
+      env: TOXENV=py34-django19
+    - python: 3.4
+      env: TOXENV=py34-django110
+    - python: 3.5
+      env: TOXENV=py35-django18
+    - python: 3.5
+      env: TOXENV=py35-django19
+    - python: 3.5
+      env: TOXENV=py35-django110
+    - python: 3.6
+      env: TOXENV=py36-django18
+    - python: 3.6
+      env: TOXENV=py36-django19
+    - python: 3.6
+      env: TOXENV=py36-django110
+
+    - python: 3.5
+      env: TOXENV=lint
+    - python: 3.5
+      env: TOXENV=sandbox
+
+  allow_failures:
+    - python: 3.5
+      env: TOXENV=lint
+
 
 env:
-    global:
-        # $TRANSIFEX_PASSWORD for oscar_bot (used in transifex.sh)
-        - secure: FuIlzEsGJiAwhaIRBmRNsq9eXmuzs25fX6BChknW4lDyVAySWMp0+Zps9Bd0JgfFYUG3Ip+OTmksYIoTUsG25ZJS9cq1IFt3QKUAN70YCI/4ZBLeIdICPEyxq+Km179+NeEXmBUug17RLMLxh3MWfO+RKUHK9yHIPNNpq0dNyoo=
-
-        # These two environment variables could be set by Travis itself, or Travis
-        # could configure itself in /etc/, ~/, or inside of the virtual
-        # environments. In any case if these two values get configured then end
-        # users only need to enable the pip cache and manually run pip wheel before
-        # running pip install.
-        - PIP_WHEEL_DIR=$HOME/.cache/pip/wheels
-        - PIP_FIND_LINKS=file://$HOME/.cache/pip/wheels
-    matrix:
-        - DJANGO=Django==1.8.13
-        - DJANGO=Django==1.9.7
-        - DJANGO=Django==1.10.4
+  global:
+    # $TRANSIFEX_PASSWORD for oscar_bot (used in transifex.sh)
+    - secure: FuIlzEsGJiAwhaIRBmRNsq9eXmuzs25fX6BChknW4lDyVAySWMp0+Zps9Bd0JgfFYUG3Ip+OTmksYIoTUsG25ZJS9cq1IFt3QKUAN70YCI/4ZBLeIdICPEyxq+Km179+NeEXmBUug17RLMLxh3MWfO+RKUHK9yHIPNNpq0dNyoo=
 
+    # These two environment variables could be set by Travis itself, or Travis
+    # could configure itself in /etc/, ~/, or inside of the virtual
+    # environments. In any case if these two values get configured then end
+    # users only need to enable the pip cache and manually run pip wheel before
+    # running pip install.
+    - PIP_WHEEL_DIR=$HOME/.cache/pip/wheels
+    - PIP_FIND_LINKS=file://$HOME/.cache/pip/wheels
+
+
+before_cache:
+  - rm -rf $HOME/.cache/pip/log
 
-matrix:
-    exclude:
-        # Python 3.3 is not supported by Django 1.9
-        - python: 3.3
-          env: "DJANGO=Django==1.9.7"
-        - python: 3.3
-          env: "DJANGO=Django==1.10.4"
 
-before_install:
-    - pip install codecov
+cache:
+  directories:
+    - $HOME/.cache/pip
+
 
 install:
-    - pip install --pre $DJANGO
-    - pip install -r requirements.txt
-    - pip list
+  - pip install tox codecov
 
-before_script:
-    # Create testing databases for running migrations against
-    - mysql -e 'CREATE DATABASE oscar_travis;'
-    - psql -c 'CREATE DATABASE oscar_travis;' -U postgres
 
 script:
-    - make travis
+  - tox
+
 
 after_success:
-    - codecov
-    - ./transifex.sh
+  - tox -e coverage-report
+  - codecov
+  - ./transifex.sh

tox.ini

@@ -1,11 +1,36 @@
 [tox]
-envlist = {py27,py33,py34,py35}-{1.8,1.9}
+envlist = py{27,34,35,36}-django{18,19,110},py33-django18,lint,sandbox
 
 [testenv]
+commands = coverage run --parallel -m pytest {posargs}
+extras = test
+deps = 
+    -r{toxinidir}/requirements.txt
+    django18: django>=1.8,<1.9
+    django19: django>=1.9,<1.10
+    django110: django>=1.10,<1.11
+
+[testenv:coverage-report]
+basepython = python3.5
+deps = coverage
+skip_install = true
 commands =
-    pip install -e .[test]
-    python runtests.py
+    coverage combine
+    coverage report
+
+
+[testenv:lint]
+basepython = python3.5
+deps = flake8
+commands = 
+    flake8 src tests setup.py
+    isort -q --recursive --diff src/ tests/
+
+
+[testenv:sandbox]
+basepython = python3.5
 deps = 
     -r{toxinidir}/requirements.txt
-    1.8: django==1.8.13
-    1.9: django==1.9.7
+    django>=1.10,<1.11
+commands = 
+    make build_sandbox