Implemented py.test runner in setup.py and added code coverage

* Implemented py.test runner in setup.py
* Removed testing support for Django 1.7 and Python 3.2

Author: georgemarshall

.travis.yml

@@ -1,39 +1,38 @@
+---
 language: python
-python: 3.5
 sudo: false
-install: pip install tox
-script: tox
+cache: pip
+matrix:
+  exclude:
+    - 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:
+  - "2.7"
+  - "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.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 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'])

runtests.py

@@ -0,0 +1,5 @@
+[aliases]
+test = pytest
+
+[wheel]
+universal = 1

setup.cfg

@@ -1,12 +1,21 @@
 #!/usr/bin/env python
-# -*- coding: utf-8 -*-
+from __future__ import print_function
 
-import re
 import os
+import re
 import sys
 
 from setuptools import setup
 
+needs_mock = sys.version_info < (3, 3)
+mock = ['mock'] if needs_mock else []
+needs_pytest = {'pytest', 'test', 'ptr'}.intersection(sys.argv)
+pytest_runner = ['pytest-runner'] if needs_pytest else []
+needs_sphinx = {'build_sphinx', 'upload_docs'}.intersection(sys.argv)
+sphinx = ['sphinx'] if needs_sphinx else []
+needs_wheel = {'bdist_wheel'}.intersection(sys.argv)
+wheel = ['wheel'] if needs_wheel else []
+
 
 def read(*paths):
     """
@@ -58,7 +67,6 @@ def get_package_data(package):
     print("  git push --tags")
     sys.exit()
 
-
 setup(
     name='djangorestframework-jsonapi',
     version=get_version('rest_framework_json_api'),
@@ -70,11 +78,6 @@ def get_package_data(package):
     author_email='',
     packages=get_packages('rest_framework_json_api'),
     package_data=get_package_data('rest_framework_json_api'),
-    install_requires=[
-        'django',
-        'djangorestframework>=3.1.0',
-        'inflection>=0.3.0'
-    ],
     classifiers=[
         'Development Status :: 5 - Production/Stable',
         'Environment :: Web Environment',
@@ -89,8 +92,21 @@ def get_package_data(package):
         'Programming Language :: Python :: 3.2',
         'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
         'Topic :: Internet :: WWW/HTTP',
         'Topic :: Software Development :: Libraries :: Application Frameworks',
         'Topic :: Software Development :: Libraries :: Python Modules',
-    ]
+    ],
+    install_requires=[
+        'inflection>=0.3.0',
+        'djangorestframework>=3.1.0',
+        'django',
+    ],
+    setup_requires=pytest_runner + sphinx + wheel,
+    tests_require=[
+        'pytest-factoryboy',
+        'pytest-django',
+        'pytest>=2.8',
+    ] + mock,
+    zip_safe=False,
 )

setup.py

@@ -1,25 +1,22 @@
 [tox]
 envlist =
-    py{27,33,34}-django17-drf{31,32},
-    py{27,33,34}-django18-drf{31,32,33},
-    py{27,34,35}-django19-drf{31,32,33,34},
+    py{27,33,34,35}-django18-drf{31,32,33,34},
+    py{27,34,35}-django19-drf{33,34},
     py{27,34,35}-django110-drf{34},
 
 [testenv]
 deps =
-    django17: Django>=1.7,<1.8
     django18: Django>=1.8,<1.9
     django19: Django>=1.9,<1.10
     django110: Django>=1.10,<1.11
     drf31: djangorestframework>=3.1,<3.2
     drf32: djangorestframework>=3.2,<3.3
     drf33: djangorestframework>=3.3,<3.4
     drf34: djangorestframework>=3.4,<3.5
-    -r{toxinidir}/requirements-development.txt
 
 setenv =
     PYTHONPATH = {toxinidir}
     DJANGO_SETTINGS_MODULE=example.settings.test
 
 commands =
-    py.test --basetemp={envtmpdir}
+    python setup.py test {posargs}