update master with django 1.9 support

.travis.yml

@@ -9,6 +9,7 @@ env:
   matrix:
     - DJANGO=">=1.7,<1.8"
     - DJANGO=">=1.8,<1.9"
+    - DJANGO=">=1.9,<1.10"
 install:
   - pip install -q coverage flake8 Django$DJANGO django-nose>=1.4
   - python setup.py install

db_mutex/__init__.py

@@ -1,5 +1,4 @@
 # flake8: noqa
-from .db_mutex import db_mutex
 from .exceptions import DBMutexError, DBMutexTimeoutError
 from .version import __version__
 

db_mutex/tests/db_mutex_tests.py

@@ -2,7 +2,7 @@
 
 from db_mutex.exceptions import DBMutexError, DBMutexTimeoutError
 from db_mutex.models import DBMutex
-from db_mutex import db_mutex
+from db_mutex.db_mutex import db_mutex
 
 from django.test import TestCase
 from django.test.utils import override_settings

db_mutex/version.py

@@ -1 +1 @@
-__version__ = '0.2.3'
+__version__ = '0.3.0'

run_tests.py

@@ -1,14 +1,10 @@
 import sys
 from optparse import OptionParser
-
-import django
-
 from settings import configure_settings
 
 
 # Configure the default settings
 configure_settings()
-django.setup()
 
 # Django nose must be imported here since it depends on the settings being configured
 from django_nose import NoseTestSuiteRunner  # noqa

setup.py

@@ -38,6 +38,7 @@ def get_version():
         'Framework :: Django',
         'Framework :: Django :: 1.7',
         'Framework :: Django :: 1.8',
+        'Framework :: Django :: 1.9',
     ],
     license='MIT',
     install_requires=[