From a1bb27eefa92176add24fedbec5bf369c3c7444c Mon Sep 17 00:00:00 2001 From: Thijs Triemstra Date: Fri, 11 Dec 2015 00:24:57 +0100 Subject: [PATCH 1/4] ignore .cache and .eggs directories --- .gitignore | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 4e3aad1..1b43df8 100644 --- a/.gitignore +++ b/.gitignore @@ -12,4 +12,6 @@ htmlcov/ .coverage .python-version .idea -dist/ \ No newline at end of file +dist/ +.cache +.eggs From 936bf395d8247bbe5315a879d3af54b0af1f2717 Mon Sep 17 00:00:00 2001 From: Thijs Triemstra Date: Fri, 11 Dec 2015 00:25:15 +0100 Subject: [PATCH 2/4] add Django 1.9 build --- .travis.yml | 3 +++ tox.ini | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 8ef59ed..ece55a4 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,10 +8,13 @@ script: tox env: - TOXENV=py27-django-17 - TOXENV=py27-django-18 + - TOXENV=py27-django-19 - TOXENV=py33-django-17 - TOXENV=py33-django-18 + - TOXENV=py33-django-19 - TOXENV=py34-django-17 - TOXENV=py34-django-18 + - TOXENV=py34-django-19 after_success: coveralls deploy: provider: pypi diff --git a/tox.ini b/tox.ini index 31436d9..2d1aefc 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,7 @@ downloadcache = {distshare} args_are_paths = false envlist = - {py27,py33,py34}-django-{17,18} + {py27,py33,py34}-django-{17,18,19} [testenv] basepython = @@ -17,4 +17,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 From 1cc9511d134a1d91c69a7c419eb60c2a8bce8fd0 Mon Sep 17 00:00:00 2001 From: Thijs Triemstra Date: Fri, 11 Dec 2015 00:26:25 +0100 Subject: [PATCH 3/4] replace deprecated import_module import --- queued_storage/utils.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/queued_storage/utils.py b/queued_storage/utils.py index bf01741..a57e9c6 100644 --- 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): From 7720e6340ce0a0b3cf42b5c9e7d44a7212761279 Mon Sep 17 00:00:00 2001 From: Thijs Triemstra Date: Fri, 11 Dec 2015 00:36:12 +0100 Subject: [PATCH 4/4] Django 1.9 doesn't support Python 3.3 --- .travis.yml | 1 - tox.ini | 3 ++- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index ece55a4..83ce8c9 100644 --- a/.travis.yml +++ b/.travis.yml @@ -11,7 +11,6 @@ env: - TOXENV=py27-django-19 - TOXENV=py33-django-17 - TOXENV=py33-django-18 - - TOXENV=py33-django-19 - TOXENV=py34-django-17 - TOXENV=py34-django-18 - TOXENV=py34-django-19 diff --git a/tox.ini b/tox.ini index 2d1aefc..b47a563 100644 --- a/tox.ini +++ b/tox.ini @@ -2,7 +2,8 @@ downloadcache = {distshare} args_are_paths = false envlist = - {py27,py33,py34}-django-{17,18,19} + {py27,py34}-django-19 + {py27,py33,py34}-django-{17,18} [testenv] basepython =