Updated filter() with exclude()

Author: saadmk11

readthedocs/api/v2/views/model_views.py

@@ -130,7 +130,8 @@ def active_versions(self, request, **kwargs):
             Project.objects.api(request.user),
             pk=kwargs['pk'],
         )
-        versions = project.versions.filter(active=True)
+        versions = project.versions.filter(
+            active=True).exclude(type=PULL_REQUEST)
         return Response({
             'versions': VersionSerializer(versions, many=True).data,
         })

readthedocs/core/management/commands/update_repos.py

@@ -10,6 +10,7 @@
 
 from django.core.management.base import BaseCommand
 
+from readthedocs.builds.constants import PULL_REQUEST
 from readthedocs.builds.models import Build, Version
 from readthedocs.core.utils import trigger_build
 from readthedocs.projects import tasks
@@ -62,7 +63,7 @@ def handle(self, *args, **options):
                             project__slug=slug,
                             active=True,
                             uploaded=False,
-                    ):
+                    ).exclude(type=PULL_REQUEST):
 
                         build = Build.objects.create(
                             project=version.project,
@@ -87,7 +88,7 @@ def handle(self, *args, **options):
                 for version in Version.objects.filter(
                         active=True,
                         uploaded=False,
-                ):
+                ).exclude(type=PULL_REQUEST):
                     # pylint: disable=no-value-for-parameter
                     tasks.update_docs_task(
                         version.project_id,

readthedocs/core/management/commands/update_versions.py

@@ -4,6 +4,7 @@
 
 from django.core.management.base import BaseCommand
 
+from readthedocs.builds.constants import PULL_REQUEST
 from readthedocs.builds.models import Version
 from readthedocs.projects.tasks import update_docs_task
 
@@ -13,7 +14,9 @@ class Command(BaseCommand):
     help = __doc__
 
     def handle(self, *args, **options):
-        for version in Version.objects.filter(active=True, built=False):
+        for version in Version.objects.filter(
+                active=True, built=False
+        ).exclude(type=PULL_REQUEST):
             # pylint: disable=no-value-for-parameter
             update_docs_task(
                 version.project_id,

readthedocs/core/views/hooks.py

@@ -8,7 +8,7 @@
 from django.shortcuts import redirect
 from django.views.decorators.csrf import csrf_exempt
 
-from readthedocs.builds.constants import LATEST
+from readthedocs.builds.constants import LATEST, PULL_REQUEST
 from readthedocs.core.utils import trigger_build
 from readthedocs.projects import constants
 from readthedocs.projects.models import Feature, Project
@@ -95,7 +95,7 @@ def sync_versions(project):
         version = (
             project.versions.filter(
                 identifier=version_identifier,
-            ).first()
+            ).exclude(type=PULL_REQUEST).first()
         )
         if not version:
             log.info('Unable to sync from %s version', version_identifier)

readthedocs/projects/admin.py

@@ -7,6 +7,7 @@
 from django.utils.translation import ugettext_lazy as _
 from guardian.admin import GuardedModelAdmin
 
+from readthedocs.builds.constants import PULL_REQUEST
 from readthedocs.builds.models import Version
 from readthedocs.core.models import UserProfile
 from readthedocs.core.utils import broadcast, trigger_build
@@ -233,7 +234,8 @@ def reindex_active_versions(self, request, queryset):
         """Reindex all active versions of the selected projects to ES."""
         qs_iterator = queryset.iterator()
         for project in qs_iterator:
-            version_qs = Version.objects.filter(project=project)
+            version_qs = Version.objects.filter(
+                project=project).exclude(type=PULL_REQUEST)
             active_versions = version_qs.filter(active=True)
 
             if not active_versions.exists():
@@ -265,7 +267,8 @@ def wipe_all_versions(self, request, queryset):
         """Wipe indexes of all versions of selected projects."""
         qs_iterator = queryset.iterator()
         for project in qs_iterator:
-            version_qs = Version.objects.filter(project=project)
+            version_qs = Version.objects.filter(
+                project=project).exclude(type=PULL_REQUEST)
             if not version_qs.exists():
                 self.message_user(
                     request,

readthedocs/projects/forms.py

@@ -14,6 +14,7 @@
 from guardian.shortcuts import assign
 from textclassifier.validators import ClassifierValidator
 
+from readthedocs.builds.constants import PULL_REQUEST
 from readthedocs.core.utils import slugify, trigger_build
 from readthedocs.core.utils.extend import SettingsOverrideObject
 from readthedocs.integrations.models import Integration
@@ -241,7 +242,10 @@ def __init__(self, *args, **kwargs):
 
         default_choice = (None, '-' * 9)
         versions_choices = self.instance.versions.filter(
-            machine=False).values_list('verbose_name', flat=True)
+            machine=False).exclude(type=PULL_REQUEST).values_list(
+            'verbose_name', flat=True
+        )
+
 
         self.fields['default_branch'].widget = forms.Select(
             choices=[default_choice] + list(