Skip to content
This repository has been archived by the owner on Feb 13, 2019. It is now read-only.

Commit

Permalink
Celery is now a requirement
Browse files Browse the repository at this point in the history
Also cleanup unnecessary (and broken) task import error handler. This is a relic of a lost, magical time we'll never
see again.
  • Loading branch information
mparent61 committed Feb 16, 2016
1 parent 2262cda commit 9088532
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 13 deletions.
13 changes: 2 additions & 11 deletions bulbs/content/models.py
Expand Up @@ -20,19 +20,10 @@
from djbetty import ImageField

from bulbs.content import TagCache
from bulbs.content.tasks import (index_content_contributions,
index_content_report_content_proxy)
from .filters import Authors, Published, Status, Tags, FeatureTypes

try:
from bulbs.content.tasks import (
index_content_contributions, index_content_report_content_proxy,
index as index_task
) # noqa
CELERY_ENABLED = True
except ImportError:
index_task = lambda *x: x
index_content_contributions = lambda *x: x
index_content_report_content_proxy = lambda *x: x
CELERY_ENABLED = False


logger = logging.getLogger(__name__)
Expand Down
4 changes: 2 additions & 2 deletions setup.py
Expand Up @@ -15,11 +15,12 @@
author_email = "csinchok@theonion.com"
license = "BSD"
requires = [
"celery==3.1.10",
"Django>=1.8,<1.9",
"django-betty-cropper>=0.2.0",
"djangorestframework==3.1.1",
"django-polymorphic==0.7.1",
"djes>=0.1.7",
"djes>=0.1.105",
"django-filter==0.9.2",
"django-json-field==0.5.5",
"djangorestframework-csv==1.3.3",
Expand All @@ -41,7 +42,6 @@
"pytest==2.7.3",
"pytest-cov==1.8.1",
"pytest-django==2.8.0",
"celery==3.1.10",
"coveralls==0.4.1",
"freezegun"
]
Expand Down

0 comments on commit 9088532

Please sign in to comment.