Allow to hook the initial build from outside

Add a new attribute to `trigger_build` to do not execute the task but
just return the immutable signature of it, so it can be chained into a
bigger task from outside when it's needed to do something else
before/after it's execution.

Author: humitos

readthedocs/core/utils/__init__.py

@@ -75,7 +75,7 @@ def cname_to_slug(host):
     return slug
 
 
-def trigger_build(project, version=None, record=True, force=False, basic=False):
+def trigger_build(project, version=None, record=True, force=False, basic=False, execute_task=True):
     """
     Trigger build for project and version.
 
@@ -127,10 +127,12 @@ def trigger_build(project, version=None, record=True, force=False, basic=False):
     options['soft_time_limit'] = time_limit
     options['time_limit'] = int(time_limit * 1.2)
 
-    update_docs = UpdateDocsTask()
-    update_docs.apply_async(kwargs=kwargs, **options)
-
-    return build
+    if not execute_task:
+        return UpdateDocsTask().si(**kwargs, options=options)
+    else:
+        update_docs = UpdateDocsTask()
+        update_docs.apply_async(kwargs=kwargs, **options)
+        return build
 
 
 def send_email(recipient, subject, template, template_html, context=None,

readthedocs/projects/signals.py

@@ -4,6 +4,7 @@
 import django.dispatch
 from django.dispatch import receiver
 
+from readthedocs.core.utils import trigger_build
 from readthedocs.oauth.utils import attach_webhook
 
 
@@ -23,3 +24,10 @@ def handle_project_import(sender, **kwargs):
     request = kwargs.get('request')
 
     attach_webhook(project=project, request=request)
+
+
+# TODO: move this to ImportWizardView.trigger_initial_build
+# @receiver(project_import)
+# def trigger_initial_build(sender, request, **kwargs):
+#     project = sender
+#     trigger_build(project)

readthedocs/projects/views/private.py

@@ -253,8 +253,11 @@ def done(self, form_list, **kwargs):
                 setattr(project, field, value)
         basic_only = True
         project.save()
+
+        # TODO: if we want to make the ``attach_webhook`` async, we need to
+        # consider the message shown to the user when not valid webhook.
+
         project_import.send(sender=project, request=self.request)
-        trigger_build(project, basic=basic_only)
         return HttpResponseRedirect(
             reverse('projects_detail', args=[project.slug]))
 

readthedocs/settings/dev.py

@@ -35,6 +35,7 @@ def DATABASES(self):  # noqa
     CELERY_RESULT_BACKEND = 'redis://localhost:6379/0'
     CELERY_RESULT_SERIALIZER = 'json'
     CELERY_ALWAYS_EAGER = True
+    CELERY_TASK_IGNORE_RESULT = False
 
     HAYSTACK_CONNECTIONS = {
         'default': {