Skip to content

Commit e6650e9

Browse files
committed
Clean out haystack v1 settings
1 parent 26b4e51 commit e6650e9

File tree

2 files changed

+6
-18
lines changed

2 files changed

+6
-18
lines changed

celery_haystack/test_settings.py

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,5 @@
11
import os
22

3-
import django
4-
53
from celery import Celery
64

75
app = Celery('celery_haystack')
@@ -34,19 +32,10 @@
3432
CELERYD_LOG_LEVEL = "DEBUG"
3533
CELERY_DEFAULT_QUEUE = "celery-haystack"
3634

37-
if django.VERSION < (1, 6):
38-
TEST_RUNNER = 'discover_runner.DiscoverRunner'
39-
40-
if os.environ.get('HAYSTACK') == 'v1':
41-
HAYSTACK_SITECONF = 'celery_haystack.tests.search_sites'
42-
HAYSTACK_SEARCH_ENGINE = 'whoosh'
43-
HAYSTACK_WHOOSH_PATH = os.path.join(TEST_ROOT, 'whoosh_index')
44-
45-
elif os.environ.get('HAYSTACK') == 'v2':
46-
HAYSTACK_CONNECTIONS = {
47-
'default': {
48-
'ENGINE': 'haystack.backends.whoosh_backend.WhooshEngine',
49-
'PATH': os.path.join(TEST_ROOT, 'whoosh_index'),
50-
}
35+
HAYSTACK_CONNECTIONS = {
36+
'default': {
37+
'ENGINE': 'haystack.backends.whoosh_backend.WhooshEngine',
38+
'PATH': os.path.join(TEST_ROOT, 'whoosh_index'),
5139
}
52-
HAYSTACK_SIGNAL_PROCESSOR = 'celery_haystack.signals.CelerySignalProcessor'
40+
}
41+
HAYSTACK_SIGNAL_PROCESSOR = 'celery_haystack.signals.CelerySignalProcessor'

requirements/v1.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,3 @@
1-
django-discover-runner
21
django-haystack==1.2.7
32
django-celery
43
celery

0 commit comments

Comments
 (0)