Deploy hotfixes (#2972)

* Don't explode on makedirs

* Fix ad lookup

* Fix task designation

* Handle version handling.

This should be a decorator

* Upgrade slumber

Author: ericholscher

readthedocs/builds/syncers.py

@@ -15,6 +15,7 @@
 from django.conf import settings
 
 from readthedocs.core.utils.extend import SettingsOverrideObject
+from readthedocs.core.utils import safe_makedirs
 
 
 log = logging.getLogger(__name__)
@@ -127,8 +128,9 @@ def copy(cls, path, target, host, is_file=False, **__):
         sync_user = getattr(settings, 'SYNC_USER', getpass.getuser())
         if not is_file:
             path += "/"
-        log.info("Local Copy %s to %s", path, target)
-        os.makedirs(target)
+        log.info("Remote Pull %s to %s", path, target)
+        if not is_file and not os.path.exists(target):
+            safe_makedirs(target)
         # Add a slash when copying directories
         sync_cmd = "rsync -e 'ssh -T' -av --delete {user}@{host}:{path} {target}".format(
             host=host,

readthedocs/donate/signals.py

@@ -163,7 +163,7 @@ def is_gold_project(project):
 
 def is_community_only(user, project):
     """Return True is this project or user should only be shown community ads"""
-    if user.is_authenticated() and user.profile.as_opt_out:
+    if user.is_authenticated() and not user.profile.allow_ads:
         return True
     if not project.allow_promos:
         return True

readthedocs/projects/tasks.py

@@ -918,20 +918,32 @@ def clear_artifacts(version_pk):
     clear_html_artifacts(version)
 
 
+@task()
 def clear_pdf_artifacts(version):
+    if isinstance(version, int):
+        version = Version.objects.get(pk=version)
     remove_dir(version.project.get_production_media_path(
         type_='pdf', version_slug=version.slug))
 
 
+@task()
 def clear_epub_artifacts(version):
+    if isinstance(version, int):
+        version = Version.objects.get(pk=version)
     remove_dir(version.project.get_production_media_path(
         type_='epub', version_slug=version.slug))
 
 
+@task()
 def clear_htmlzip_artifacts(version):
+    if isinstance(version, int):
+        version = Version.objects.get(pk=version)
     remove_dir(version.project.get_production_media_path(
         type_='htmlzip', version_slug=version.slug))
 
 
+@task()
 def clear_html_artifacts(version):
+    if isinstance(version, int):
+        version = Version.objects.get(pk=version)
     remove_dir(version.project.rtd_build_path(version=version.slug))

requirements/pip.txt

@@ -21,7 +21,7 @@ django-vanilla-views==1.0.4
 jsonfield==1.0.3
 
 requests==2.3.0
-slumber==0.7.0
+slumber==0.7.1
 lxml==3.3.5
 
 django-countries==3.4.1