From 98aa75faf1875862147af5c48c60d5c60d88c28b Mon Sep 17 00:00:00 2001 From: Daniel Welch Date: Thu, 7 Dec 2017 18:30:54 -0500 Subject: [PATCH 1/3] fix usage of iter_entry_points --- django_q/conf.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/django_q/conf.py b/django_q/conf.py index 2bb6c98..6e955a1 100644 --- a/django_q/conf.py +++ b/django_q/conf.py @@ -216,10 +216,10 @@ if Conf.ERROR_REPORTER: # iterate through the configured error reporters, # and instantiate an ErrorReporter using the provided config for name, conf in error_conf.items(): - Reporter = pkg_resources.iter_entry_points( - 'djangoq.errorreporters', name).load() - e = Reporter(**conf) - reporters.append(e) + for entry in pkg_resources.iter_entry_points( + 'djangoq.errorreporters', name): + Reporter = entry.load() + reporters.append(Reporter(**conf)) error_reporter = ErrorReporter(reporters) except ImportError: error_reporter = None From 81d4b36b1b7c9f05aa5ec4fd1241875f27e2ff04 Mon Sep 17 00:00:00 2001 From: ilan Date: Mon, 8 Jan 2018 09:57:20 +0100 Subject: [PATCH 2/3] Cherry picking compatibility commits --- .travis.yml | 2 +- django_q/tests/settings.py | 3 ++- django_q/tests/urls.py | 4 ++-- requirements.txt | 16 ++++++++-------- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.travis.yml b/.travis.yml index f7345b7..3461373 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,7 +8,7 @@ python: - "3.6" env: - - DJANGO=2.0 + - DJANGO=2.0.1 - DJANGO=1.11.8 - DJANGO=1.8.18 diff --git a/django_q/tests/settings.py b/django_q/tests/settings.py index 8bad66c..276aca0 100644 --- a/django_q/tests/settings.py +++ b/django_q/tests/settings.py @@ -33,11 +33,12 @@ MIDDLEWARE_CLASSES = ( 'django.middleware.common.CommonMiddleware', 'django.middleware.csrf.CsrfViewMiddleware', 'django.contrib.auth.middleware.AuthenticationMiddleware', - 'django.contrib.auth.middleware.SessionAuthenticationMiddleware', 'django.contrib.messages.middleware.MessageMiddleware', 'django.middleware.clickjacking.XFrameOptionsMiddleware', ) +MIDDLEWARE = MIDDLEWARE_CLASSES + ROOT_URLCONF = 'tests.urls' TEMPLATES = [ diff --git a/django_q/tests/urls.py b/django_q/tests/urls.py index eb91d28..ede2ec9 100644 --- a/django_q/tests/urls.py +++ b/django_q/tests/urls.py @@ -1,6 +1,6 @@ -from django.conf.urls import include, url +from django.conf.urls import url from django.contrib import admin urlpatterns = [ - url(r'^admin/', include(admin.site.urls)), + url(r'^admin/', admin.site.urls), ] diff --git a/requirements.txt b/requirements.txt index 6bd4a89..d88c43d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,11 +4,11 @@ # # pip-compile --output-file requirements.txt requirements.in # -arrow==0.10.0 +arrow==0.12.0 blessed==1.14.2 -boto3==1.4.7 -botocore==1.7.28 # via boto3, s3transfer -certifi==2017.7.27.1 # via requests +boto3==1.5.9 +botocore==1.8.23 # via boto3, s3transfer +certifi==2017.11.5 # via requests chardet==3.0.4 # via requests django-picklefield==1.0.0 django-redis==4.8.0 @@ -18,13 +18,13 @@ idna==2.6 # via requests iron-core==1.2.0 # via iron-mq iron-mq==0.9 jmespath==0.9.3 # via boto3, botocore -psutil==5.4.0 -pymongo==3.5.1 +psutil==5.4.3 +pymongo==3.6.0 python-dateutil==2.6.1 # via arrow, botocore, iron-core redis==2.10.6 requests==2.18.4 # via iron-core, rollbar -rollbar==0.13.13 -s3transfer==0.1.11 # via boto3 +rollbar==0.13.17 +s3transfer==0.1.12 # via boto3 six==1.11.0 # via blessed, python-dateutil, rollbar urllib3==1.22 # via requests wcwidth==0.1.7 # via blessed From 72b52b026f2536fecff599b6059e2b0fa5f0c6f8 Mon Sep 17 00:00:00 2001 From: ilan Date: Mon, 8 Jan 2018 10:21:08 +0100 Subject: [PATCH 3/3] Downgraded to Django 2.0 --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 3461373..269d24f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -8,8 +8,8 @@ python: - "3.6" env: - - DJANGO=2.0.1 - - DJANGO=1.11.8 + - DJANGO=2.0 + - DJANGO=1.11.9 - DJANGO=1.8.18 sudo: false