From 537fde7f5b4cd7f42353d049ce06a6e440d5215c Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Wed, 11 Jul 2018 20:46:21 +0200 Subject: [PATCH 1/3] Revert "Update Travis deploy info." This reverts commit b43bf2dd47c7fc752e6fdaa317663cf6cdbbfdeb. From 5770f02bab75514753679d226505cdb7e7f34c5b Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Wed, 11 Jul 2018 20:46:21 +0200 Subject: [PATCH 2/3] Revert "Production/stable, really." This reverts commit ba346e2af4415cacdd1de313b7aa9abbfbaffa37. From 80a648bb035afa243d86f08a11923badc353f582 Mon Sep 17 00:00:00 2001 From: Jannis Leidel Date: Wed, 11 Jul 2018 20:46:21 +0200 Subject: [PATCH 3/3] Revert "doc: cookbook: document workaround for celery (#197)" This reverts commit 2b0d2cee0ad8592b117ac280e97a308853fd46af. --- docs/cookbook.rst | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/docs/cookbook.rst b/docs/cookbook.rst index 8fcc467..93b781b 100644 --- a/docs/cookbook.rst +++ b/docs/cookbook.rst @@ -136,11 +136,8 @@ Celery's documentation`_: os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'mysite.settings') os.environ.setdefault('DJANGO_CONFIGURATION', 'MySiteConfiguration') - # The extra check is necessary to not call django.setup() twice. - from configurations import importer - if not importer.installed: - import configurations - configurations.setup() + import configurations + configurations.setup() app = Celery('mysite') app.config_from_object('django.conf:settings')