Merge remote-tracking branch 'origin/main' into release

python · Nov 15, 2023 · cefa5f0 · cefa5f0
2 parents d40871f + 82682b0
commit cefa5f0
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/base-requirements.txt b/base-requirements.txt
@@ -21,7 +21,7 @@ icalendar==4.0.7
 chardet==4.0.0
 # TODO: We may drop 'django-imagekit' completely.
 django-imagekit==4.0.2
-django-haystack==3.0
+django-haystack==3.2.1
 elasticsearch>=7,<8
 # TODO: 0.14.0 only supports Django 1.8 and 1.11.
 django-tastypie==0.14.3

diff --git a/pydotorg/settings/heroku.py b/pydotorg/settings/heroku.py
@@ -26,7 +26,7 @@
 
 HAYSTACK_CONNECTIONS = {
     'default': {
-        'ENGINE': 'haystack.backends.elasticsearch5_backend.Elasticsearch5SearchEngine',
+        'ENGINE': 'haystack.backends.elasticsearch7_backend.Elasticsearch7SearchEngine',
         'URL': HAYSTACK_SEARCHBOX_SSL_URL,
         'INDEX_NAME': 'haystack-prod',
     },

diff --git a/pydotorg/settings/local.py b/pydotorg/settings/local.py
@@ -26,7 +26,7 @@
 
 HAYSTACK_CONNECTIONS = {
     'default': {
-        'ENGINE': 'haystack.backends.elasticsearch5_backend.Elasticsearch5SearchEngine',
+        'ENGINE': 'haystack.backends.elasticsearch7_backend.Elasticsearch7SearchEngine',
         'URL': HAYSTACK_SEARCHBOX_SSL_URL,
         'INDEX_NAME': 'haystack',
     },