Merge pull request #15 from ambitioninc/develop

update master with django 1.9 support

.travis.yml

@@ -11,6 +11,7 @@ env:
   matrix:
     - DJANGO=">=1.7,<1.8"
     - DJANGO=">=1.8,<1.9"
+    - DJANGO=">=1.9,<1.10"
 install:
   - pip install -q coveralls coverage flake8 Django$DJANGO
   - pip install -r requirements/docs.txt

docs/release_notes.rst

@@ -1,6 +1,10 @@
 Release Notes
 =============
 
+v1.2.0
+------
+* Django 1.9 support
+
 v1.1.0
 ------
 * Django 1.8 support and removal of 1.6 support

issue/__init__.py

@@ -1,5 +1,4 @@
 # flake8: noqa
 from .version import __version__
-from .models import Assertion, Issue, IssueManager, IssueStatus, ModelAssertion, ModelIssue, ModelIssueManager, Responder, ResponderAction
 
 default_app_config = 'issue.apps.IssueConfig'

issue/models.py

@@ -2,10 +2,10 @@
 from datetime import datetime, timedelta
 import json
 
-from django.contrib.contenttypes import generic
+from django.contrib.contenttypes.fields import GenericForeignKey
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
-from django.utils.module_loading import import_by_path
+from django.utils.module_loading import import_string
 from enum import Enum
 from jsonfield import JSONField
 from manager_utils import ManagerUtilsManager
@@ -19,7 +19,7 @@
 
 
 def load_function(dotted_path):
-    return import_by_path(dotted_path)
+    return import_string(dotted_path)
 
 
 class ExtendedEnum(Enum):
@@ -172,7 +172,7 @@ class ModelIssue(BaseIssue):
     """
     record_type = models.ForeignKey(ContentType, related_name='+', null=True)
     record_id = models.PositiveIntegerField(default=0)
-    record = generic.GenericForeignKey('record_type', 'record_id')
+    record = GenericForeignKey('record_type', 'record_id')
 
     objects = ModelIssueManager()
 

issue/tests/models.py

@@ -2,4 +2,6 @@
 
 
 class TestModel(models.Model):
+    __test__ = False
+
     name = models.TextField()

issue/version.py

@@ -1 +1 @@
-__version__ = '1.1.0'
+__version__ = '1.2.0'

setup.py

@@ -37,11 +37,12 @@ def get_version():
         'Framework :: Django',
         'Framework :: Django :: 1.7',
         'Framework :: Django :: 1.8',
+        'Framework :: Django :: 1.9',
     ],
     license='MIT',
     install_requires=[
         'Django>=1.7',
-        'django-manager-utils>=0.8.2',
+        'django-manager-utils>=0.9.1',
         'django-regex-field>=0.2.0',
         'enum34>=1.0',
         'jsonfield>=0.9.20',
@@ -53,8 +54,6 @@ def get_version():
         'django-nose>=1.4',
         'freezegun>=0.1.12',
         'mock==1.0.1',
-        'ipdb>=0.8',
-        'ipdbplugin>=1.4',
         'six>=1.8.0',
     ],
     test_suite='run_tests.run_tests',