Implemented py.test runner in setup.py

Author: georgemarshall

.travis.yml

@@ -1,39 +1,57 @@
+---
 language: python
-python: 3.5
 sudo: false
-install: pip install tox
-script: tox
+cache: pip
+matrix:
+  exclude:
+    - python: "3.2"
+      env: DJANGO=">=1.9,<1.10" DRF=">=3.3,<3.4"
+    - python: "3.2"
+      env: DJANGO=">=1.9,<1.10" DRF=">=3.4,<3.5"
+    - python: "3.2"
+      env: DJANGO=">=1.10,<1.11" DRF=">=3.4,<3.5"
+
+    - python: "3.3"
+      env: DJANGO=">=1.9,<1.10" DRF=">=3.3,<3.4"
+    - python: "3.3"
+      env: DJANGO=">=1.9,<1.10" DRF=">=3.4,<3.5"
+    - python: "3.3"
+      env: DJANGO=">=1.10,<1.11" DRF=">=3.4,<3.5"
+
+    - python: "3.5"
+      env: DJANGO=">=1.7,<1.8" DRF=">=3.1,<3.2"
+    - python: "3.5"
+      env: DJANGO=">=1.7,<1.8" DRF=">=3.2,<3.3"
+    - python: "3.5"
+      env: DJANGO=">=1.7,<1.8" DRF=">=3.3,<3.4"
+python:
+  - "2.7"
+  - "3.2"
+  - "3.3"
+  - "3.4"
+  - "3.5"
 env:
-  - TOXENV=py27-django17-drf31
-  - TOXENV=py27-django17-drf32
-  - TOXENV=py33-django17-drf31
-  - TOXENV=py33-django17-drf32
-  - TOXENV=py34-django17-drf31
-  - TOXENV=py34-django17-drf32
-  - TOXENV=py27-django18-drf31
-  - TOXENV=py27-django18-drf32
-  - TOXENV=py27-django18-drf33
-  - TOXENV=py27-django18-drf34
-  - TOXENV=py33-django18-drf31
-  - TOXENV=py33-django18-drf32
-  - TOXENV=py33-django18-drf33
-  - TOXENV=py33-django18-drf34
-  - TOXENV=py34-django18-drf31
-  - TOXENV=py34-django18-drf32
-  - TOXENV=py34-django18-drf33
-  - TOXENV=py34-django18-drf34
-  - TOXENV=py27-django19-drf31
-  - TOXENV=py27-django19-drf32
-  - TOXENV=py27-django19-drf33
-  - TOXENV=py27-django19-drf34
-  - TOXENV=py34-django19-drf31
-  - TOXENV=py34-django19-drf32
-  - TOXENV=py34-django19-drf33
-  - TOXENV=py34-django19-drf34
-  - TOXENV=py35-django19-drf31
-  - TOXENV=py35-django19-drf32
-  - TOXENV=py35-django19-drf33
-  - TOXENV=py35-django19-drf34
-  - TOXENV=py27-django110-drf34
-  - TOXENV=py34-django110-drf34
-  - TOXENV=py35-django110-drf34
+  - DJANGO=">=1.7,<1.8" DRF=">=3.1,<3.2"
+  - DJANGO=">=1.7,<1.8" DRF=">=3.2,<3.3"
+  - DJANGO=">=1.7,<1.8" DRF=">=3.3,<3.4"
+
+  - DJANGO=">=1.8,<1.9" DRF=">=3.1,<3.2"
+  - DJANGO=">=1.8,<1.9" DRF=">=3.2,<3.3"
+  - DJANGO=">=1.8,<1.9" DRF=">=3.3,<3.4"
+  - DJANGO=">=1.8,<1.9" DRF=">=3.4,<3.5"
+
+  - DJANGO=">=1.9,<1.10" DRF=">=3.3,<3.4"
+  - DJANGO=">=1.9,<1.10" DRF=">=3.4,<3.5"
+
+  - DJANGO=">=1.10,<1.11" DRF=">=3.4,<3.5"
+before_install:
+  # Force an upgrade of py to avoid VersionConflict
+  - pip install --upgrade py
+  - pip install 'coverage<4; python_version == "3.2"' codecov
+install:
+  - pip install Django${DJANGO} djangorestframework${DRF}
+  - python setup.py install
+script:
+  - coverage run setup.py -v test
+after_success:
+  - codecov

example/tests/integration/test_includes.py

@@ -2,10 +2,13 @@
 from django.core.urlresolvers import reverse
 
 from example.tests.utils import load_json
-import mock
 
-pytestmark = pytest.mark.django_db
+try:
+    from unittest import mock
+except ImportError:
+    import mock
 
+pytestmark = pytest.mark.django_db
 
 
 @mock.patch('rest_framework_json_api.utils.get_default_included_resources_from_serializer', new=lambda s: ['comments'])