Merge 040bf6e into 09c6864

.travis.yml

@@ -4,22 +4,39 @@ language: python
 
 env:
   - TOXENV=flake8
-  - TOXENV=py27-1.7
-  - TOXENV=py27-1.8
-  - TOXENV=py27-1.9
-  - TOXENV=py27-master
-  - TOXENV=py33-1.7
-  - TOXENV=py33-1.8
-  - TOXENV=py34-1.7
-  - TOXENV=py34-1.8
-  - TOXENV=py34-1.9
-  - TOXENV=py34-master
 
 matrix:
   fast_finish: true
-  allow_failures:
-    - env: TOXENV=py27-master
-    - env: TOXENV=py34-master
+  include:
+    - python: 2.7
+      env: TOXENV=py27-1.8
+    - python: 2.7
+      env: TOXENV=py27-1.9
+    - python: 2.7
+      env: TOXENV=py27-1.10
+    - python: 2.7
+      env: TOXENV=py27-1.11
+
+    - python: 3.4
+      env: TOXENV=py34-1.8
+    - python: 3.4
+      env: TOXENV=py34-1.9
+    - python: 3.4
+      env: TOXENV=py34-1.10
+    - python: 3.4
+      env: TOXENV=py34-1.11
+
+    - python: 3.5
+      env: TOXENV=py35-1.8
+    - python: 3.5
+      env: TOXENV=py35-1.9
+    - python: 3.5
+      env: TOXENV=py35-1.10
+    - python: 3.5
+      env: TOXENV=py35-1.11
+
+    - python: 3.6
+      env: TOXENV=py36-1.11
 
 install:
   pip install tox coveralls

reverse_unique/fields.py

@@ -1,4 +1,3 @@
-import django
 try:
     from django.db.models.fields.related import ReverseSingleRelatedObjectDescriptor as ForwardManyToOneDescriptor
 except ImportError:
@@ -7,13 +6,6 @@
 from django.db.models.fields.related import ForeignObject
 from django.db import models
 
-if django.VERSION >= (1, 8):
-    def _get_related_field(model, name):
-        return model._meta.get_field(name).field
-else:
-    def _get_related_field(model, name):
-        return model._meta.get_field_by_name(name)[0].field
-
 
 class ReverseUniqueDescriptor(ForwardManyToOneDescriptor):
     def __set__(self, instance, value):
@@ -54,7 +46,7 @@ def resolve_related_fields(self):
                                 % (len(possible_targets), [f.name for f in possible_targets]))
             related_field = possible_targets[0]
         else:
-            related_field = _get_related_field(self.model, self.through)
+            related_field = self.model._meta.get_field(self.through).field
         if related_field.rel.to._meta.concrete_model != self.model._meta.concrete_model:
             # We have found a foreign key pointing to parent model.
             # This will only work if the fk is pointing to a value

reverse_unique_tests/settings.py

@@ -16,5 +16,3 @@
     'reverse_unique',
     'reverse_unique_tests',
 ]
-
-SILENCED_SYSTEM_CHECKS = ['1_7.W001']

setup.py

@@ -21,15 +21,19 @@ def read(fname):
         'Development Status :: 5 - Production/Stable',
         'Environment :: Console',
         'Framework :: Django',
+        'Framework :: Django :: 1.8',
+        'Framework :: Django :: 1.9',
+        'Framework :: Django :: 1.10',
+        'Framework :: Django :: 1.11',
         'Intended Audience :: Developers',
         'License :: OSI Approved :: BSD License',
         'Operating System :: OS Independent',
         'Programming Language :: Python :: 2',
         'Programming Language :: Python :: 2.7',
         'Programming Language :: Python :: 3',
-        'Programming Language :: Python :: 3.2',
-        'Programming Language :: Python :: 3.3',
         'Programming Language :: Python :: 3.4',
+        'Programming Language :: Python :: 3.5',
+        'Programming Language :: Python :: 3.6',
     ],
     packages=find_packages(exclude=['tests']),
     install_requires=['django'],

tox.ini

@@ -2,25 +2,25 @@
 args_are_paths = false
 envlist =
     flake8,
-    py27-{1.7,1.8,1.9,master},
-    py33-{1.7,1.8},
-    py34-{1.7,1.8,1.9,master}
+    py{27,34,35}-{1.8,1.9,1.10,1.11},
+    py36-1.11
 
 [testenv]
 basepython =
     py27: python2.7
-    py33: python3.3
     py34: python3.4
+    py35: python3.5
+    py36: python3.6
 usedevelop = true
 commands =
     python -R -Wonce {envbindir}/coverage run {envbindir}/django-admin.py test -v2 --settings=reverse_unique_tests.settings {posargs}
     coverage report
 deps =
     coverage
-    1.7: Django>=1.7,<1.8
     1.8: Django>=1.8,<1.9
     1.9: Django>=1.9,<1.10
-    master: https://github.com/django/django/archive/master.tar.gz
+    1.10: Django>=1.10,<1.11
+    1.11: Django>=1.11,<2.0
 
 [testenv:flake8]
 basepython = python2.7