chore: remove deprecation notices

Author: shortcuts

README.md

@@ -338,9 +338,9 @@ class MyModelMetaIndex(AlgoliaIndex):
         for index in self.indices:
             index.set_settings()
 
-    def clear_index(self):
+    def clear_objects(self):
         for index in self.indices:
-            index.clear_index()
+            index.clear_objects()
 
     def save_record(self, instance, update_fields=None, **kwargs):
         for index in self.indices:

algoliasearch_django/__init__.py

@@ -31,7 +31,6 @@
 delete_record = algolia_engine.delete_record
 update_records = algolia_engine.update_records
 raw_search = algolia_engine.raw_search
-clear_index = algolia_engine.clear_index  # TODO: deprecate
 clear_objects = algolia_engine.clear_objects
 reindex_all = algolia_engine.reindex_all
 

algoliasearch_django/registration.py

@@ -156,10 +156,6 @@ def clear_objects(self, model):
         adapter = self.get_adapter(model)
         adapter.clear_objects()
 
-    def clear_index(self, model):
-        # TODO: add deprecatd warning
-        self.clear_objects(model)
-
     def reindex_all(self, model, batch_size=1000):
         """
         Reindex all the records.

tests/test_commands.py

@@ -4,7 +4,7 @@
 
 from algoliasearch_django import algolia_engine
 from algoliasearch_django import get_adapter
-from algoliasearch_django import clear_index
+from algoliasearch_django import clear_objects
 
 from .models import Website
 from .models import User
@@ -35,8 +35,8 @@ def setUp(self):
         self.out = StringIO()
 
     def tearDown(self):
-        clear_index(Website)
-        clear_index(User)
+        clear_objects(Website)
+        clear_objects(User)
 
     def test_reindex(self):
         call_command("algolia_reindex", stdout=self.out)

tests/test_index.py

@@ -1,9 +1,7 @@
 # coding=utf-8
-import time
 from django.conf import settings
 from django.test import TestCase
 
-import unittest
 
 from algoliasearch_django import AlgoliaIndex
 from algoliasearch_django import algolia_engine
@@ -153,9 +151,6 @@ class WebsiteIndex(AlgoliaIndex):
         self.index = WebsiteIndex(Website, self.client, settings.ALGOLIA)
         self.index.reindex_all()
 
-    @unittest.skip(
-        reason="FIXME: it's a known issue that reindex all might not work properly"
-    )
     def test_reindex_no_settings(self):
         self.maxDiff = None
 
@@ -179,9 +174,6 @@ class WebsiteIndex(AlgoliaIndex):
             "An index whose model has no settings should keep its settings after reindex",
         )
 
-    @unittest.skip(
-        reason="FIXME: it's a known issue that reindex all might not work properly"
-    )
     def test_reindex_with_settings(self):
         import uuid
 
@@ -232,7 +224,7 @@ class WebsiteIndex(AlgoliaIndex):
         self.index = WebsiteIndex(Website, self.client, settings.ALGOLIA)
 
         # Given some existing query rules on the index
-        # index.__index.save_rule()  # TODO: Check query rules are kept
+        self.index.__client.save_rule()
 
         # Given some existing settings on the index
         existing_settings = self.apply_some_settings(self.index)
@@ -246,9 +238,6 @@ class WebsiteIndex(AlgoliaIndex):
         former_settings["hitsPerPage"] = 15
         self.assertDictEqual(self.index.get_settings(), former_settings)
 
-    @unittest.skip(
-        reason="FIXME: it's a known issue that reindex all might not work properly"
-    )
     def test_reindex_with_rules(self):
         # Given an existing index defined with settings
         class WebsiteIndex(AlgoliaIndex):
@@ -283,9 +272,6 @@ def remove_metadata(rule):
         self.assertEqual(len(rules), 1, "There should only be one rule")
         self.assertIn(rule, rules, "The existing rule should be kept over reindex")
 
-    @unittest.skip(
-        reason="FIXME: it's a known issue that reindex all might not work properly"
-    )
     def test_reindex_with_synonyms(self):
         # Given an existing index defined with settings
         class WebsiteIndex(AlgoliaIndex):
@@ -332,7 +318,6 @@ def apply_some_settings(self, index):
         index.settings["hitsPerPage"] = 42
         index.reindex_all()
         index.settings["hitsPerPage"] = old_hpp
-        time.sleep(10)  # FIXME: Refactor reindex_all to return taskID
         index_settings = index.get_settings()
         # Expect the instance's settings to be applied at reindex
         self.assertEqual(

tests/test_signal.py

@@ -6,7 +6,7 @@
 from algoliasearch_django import algolia_engine
 from algoliasearch_django import get_adapter
 from algoliasearch_django import raw_search
-from algoliasearch_django import clear_index
+from algoliasearch_django import clear_objects
 from algoliasearch_django import update_records
 
 from .factories import WebsiteFactory
@@ -19,7 +19,7 @@ def tearDownClass(cls):
         get_adapter(Website).delete()
 
     def tearDown(self):
-        clear_index(Website)
+        clear_objects(Website)
 
     def test_save_signal(self):
         with patch.object(algolia_engine, "save_record") as mocked_save_record: