Merge pull request #21 from thijstriemstra/master

Django 1.9 support
jazzband · Dec 14, 2015 · d29b6d8 · d29b6d8
2 parents 81776a6 + 7720e63
commit d29b6d8
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 2 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,4 +12,6 @@ htmlcov/
 .coverage
 .python-version
 .idea
-dist/
+dist/
+.cache
+.eggs
diff --git a/.travis.yml b/.travis.yml
@@ -8,10 +8,12 @@ script: tox
 env:
   - TOXENV=py27-django-17
   - TOXENV=py27-django-18
+  - TOXENV=py27-django-19
   - TOXENV=py33-django-17
   - TOXENV=py33-django-18
   - TOXENV=py34-django-17
   - TOXENV=py34-django-18
+  - TOXENV=py34-django-19
 after_success: coveralls
 deploy:
   provider: pypi

diff --git a/queued_storage/utils.py b/queued_storage/utils.py
@@ -1,6 +1,7 @@
+from importlib import import_module
+
 import django
 from django.core.exceptions import ImproperlyConfigured
-from django.utils.importlib import import_module
 
 
 def import_attribute(import_path=None, options=None):

diff --git a/tox.ini b/tox.ini
@@ -2,6 +2,7 @@
 downloadcache = {distshare}
 args_are_paths = false
 envlist =
+    {py27,py34}-django-19
     {py27,py33,py34}-django-{17,18}
 
 [testenv]
@@ -17,4 +18,5 @@ whitelist_externals = make
 deps =
     django-17: Django>=1.7,<1.8
     django-18: Django>=1.8,<1.9
+    django-19: Django>=1.9,<2.0
     -rtests/requirements.txt