Merge pull request #2427 from DavidMuller/pytest_version_bumps

Preliminary Support For Django 1.8 Alpha

.travis.yml

@@ -21,6 +21,10 @@ env:
     - TOX_ENV=py26-django15
     - TOX_ENV=py27-django14
     - TOX_ENV=py26-django14
+    - TOX_ENV=py34-django18alpha
+    - TOX_ENV=py33-django18alpha
+    - TOX_ENV=py32-django18alpha
+    - TOX_ENV=py27-django18alpha
     - TOX_ENV=py34-djangomaster
     - TOX_ENV=py33-djangomaster
     - TOX_ENV=py32-djangomaster
@@ -29,6 +33,10 @@ env:
 matrix:
   fast_finish: true
   allow_failures:
+    - env: TOX_ENV=py34-django18alpha
+    - env: TOX_ENV=py33-django18alpha
+    - env: TOX_ENV=py32-django18alpha
+    - env: TOX_ENV=py27-django18alpha
     - env: TOX_ENV=py34-djangomaster
     - env: TOX_ENV=py33-djangomaster
     - env: TOX_ENV=py32-djangomaster

requirements.txt

@@ -2,8 +2,8 @@
 Django>=1.4.11
 
 # Test requirements
-pytest-django==2.6
+pytest-django==2.8.0
-pytest==2.5.2
+pytest==2.6.4
 pytest-cov==1.6
 flake8==2.2.2
 

tests/test_multitable_inheritance.py

@@ -48,8 +48,8 @@ class InheritedModelSerializationTests(TestCase):
         Assert that a model with a onetoone field that is the primary key is
         not treated like a derived model
         """
-        parent = ParentModel(name1='parent name')
+        parent = ParentModel.objects.create(name1='parent name')
-        associate = AssociatedModel(name='hello', ref=parent)
+        associate = AssociatedModel.objects.create(name='hello', ref=parent)
         serializer = AssociatedModelSerializer(associate)
         self.assertEqual(set(serializer.data.keys()),
                          set(['name', 'ref']))

tox.ini

@@ -3,7 +3,7 @@ envlist =
        py27-{flake8,docs},
        {py26,py27}-django14,
        {py26,py27,py32,py33,py34}-django{15,16},
-       {py27,py32,py33,py34}-django{17,master}
+       {py27,py32,py33,py34}-django{17,18alpha,master}
 
 [testenv]
 commands = ./runtests.py --fast
@@ -14,13 +14,14 @@ deps =
        django15: Django==1.5.6  # Should track minimum supported
        django16: Django==1.6.3  # Should track minimum supported
        django17: Django==1.7.2  # Should track maximum supported
+       django18alpha: https://www.djangoproject.com/download/1.8a1/tarball/
        djangomaster: https://github.com/django/django/zipball/master
        {py26,py27}-django{14,15,16,17}: django-guardian==1.2.3
        {py26,py27}-django{14,15,16}: oauth2==1.5.211
        {py26,py27}-django{14,15,16}: django-oauth-plus==2.2.1
        {py26,py27}-django{14,15}: django-oauth2-provider==0.2.3
        {py26,py27}-django16: django-oauth2-provider==0.2.4
-       pytest-django==2.6.1
+       pytest-django==2.8.0
        django-filter==0.7
        defusedxml==0.3
        markdown>=2.1.0
@@ -28,7 +29,7 @@ deps =
 
 [testenv:py27-flake8]
 deps =
-       pytest==2.5.2
+       pytest==2.6.4
        flake8==2.2.2
 commands = ./runtests.py --lintonly