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

ewdurbin · ewdurbin · commit f7ff441462e8 · 2023-11-15T10:52:56.000-05:00
diff --git a/downloads/search_indexes.py b/downloads/search_indexes.py
@@ -13,7 +13,6 @@ class ReleaseIndex(indexes.SearchIndex, indexes.Indexable):
     name = indexes.CharField(model_attr='name')
     description = indexes.CharField()
     path = indexes.CharField()
-    version = indexes.CharField(model_attr='version')
     release_notes_url = indexes.CharField(model_attr='release_notes_url')
     release_date = indexes.DateTimeField(model_attr='release_date')
 
diff --git a/pydotorg/settings/heroku.py b/pydotorg/settings/heroku.py
@@ -28,7 +28,7 @@
     'default': {
         'ENGINE': 'haystack.backends.elasticsearch7_backend.Elasticsearch7SearchEngine',
         'URL': HAYSTACK_SEARCHBOX_SSL_URL,
-        'INDEX_NAME': 'haystack-prod',
+        'INDEX_NAME': config('HAYSTACK_INDEX', default='haystack-prod'),
     },
 }
 

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@`
`28`	`28`	`'default': {`
`29`	`29`	`'ENGINE': 'haystack.backends.elasticsearch7_backend.Elasticsearch7SearchEngine',`
`30`	`30`	`'URL': HAYSTACK_SEARCHBOX_SSL_URL,`
`31`		`- 'INDEX_NAME': 'haystack-prod',`
	`31`	`+ 'INDEX_NAME': config('HAYSTACK_INDEX', default='haystack-prod'),`
`32`	`32`	`},`
`33`	`33`	`}`
`34`	`34`