Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 4 additions & 0 deletions docs/release_notes.rst
Original file line number Diff line number Diff line change
@@ -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
Expand Down
1 change: 0 additions & 1 deletion issue/__init__.py
Original file line number Diff line number Diff line change
@@ -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'
8 changes: 4 additions & 4 deletions issue/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -19,7 +19,7 @@


def load_function(dotted_path):
return import_by_path(dotted_path)
return import_string(dotted_path)


class ExtendedEnum(Enum):
Expand Down Expand Up @@ -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()

Expand Down
2 changes: 2 additions & 0 deletions issue/tests/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,6 @@


class TestModel(models.Model):
__test__ = False

name = models.TextField()
2 changes: 1 addition & 1 deletion issue/version.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '1.1.0'
__version__ = '1.2.0'
5 changes: 2 additions & 3 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand All @@ -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',
Expand Down