fixup as per review

Author: safwanrahman

.travis.yml

@@ -43,4 +43,3 @@ notifications:
 branches:
   only:
   - master
-  - search_upgrade

readthedocs/projects/utils.py

@@ -32,23 +32,6 @@ def version_from_slug(slug, version):
     return v
 
 
-def find_file(basename, pattern, path):
-    """
-    Recursively find matching file.
-
-    :param basename: Basename of a file to match
-    :param pattern: Pattern to match
-    :param path: the directory to search for the file
-    :returns: path of matching file
-    """
-    for root, _, files in os.walk(path):
-        for filename in files:
-            file_basename = os.path.splitext(filename)[0]
-
-            if fnmatch.fnmatch(filename, pattern) and file_basename == basename:
-                return os.path.join(root, filename)
-
-
 def run(*commands):
     """
     Run one or more commands.

readthedocs/search/conf.py

@@ -4,7 +4,6 @@
 
 from readthedocs.projects.models import Project, HTMLFile
 from readthedocs.search.faceted_search import ProjectSearch, FileSearch
-from .conf import SEARCH_EXCLUDED_FILE
 from .mixins import RTDDocTypeMixin
 
 project_conf = settings.ES_INDEXES['project']
@@ -64,6 +63,8 @@ class Meta(object):
 
     # Fields to perform search with weight
     search_fields = ['title^10', 'headers^5', 'content']
+    # Exclude some files to not index
+    excluded_files = ['search.html', 'genindex.html', 'py-modindex.html']
 
     @classmethod
     def faceted_search(cls, query, projects_list=None, versions_list=None, using=None, index=None):
@@ -120,5 +121,5 @@ def get_queryset(self):
         # Do not index files that belong to non sphinx project
         # Also do not index certain files
         queryset = (queryset.filter(project__documentation_type='sphinx')
-                            .exclude(name__in=SEARCH_EXCLUDED_FILE))
+                            .exclude(name__in=self.excluded_files))
         return queryset

readthedocs/search/documents.py

@@ -2,6 +2,6 @@
 
 
 class SearchPagination(PageNumberPagination):
-    page_size = 10
+    page_size = 25
     page_size_query_param = 'page_size'
     max_page_size = 100