.all() Updated with .exclude()

Author: saadmk11

readthedocs/api/v2/views/model_views.py

@@ -10,7 +10,7 @@
 from rest_framework.renderers import BaseRenderer, JSONRenderer
 from rest_framework.response import Response
 
-from readthedocs.builds.constants import BRANCH, TAG
+from readthedocs.builds.constants import BRANCH, TAG, PULL_REQUEST
 from readthedocs.builds.models import Build, BuildCommandResult, Version
 from readthedocs.core.utils import trigger_build
 from readthedocs.core.utils.extend import SettingsOverrideObject
@@ -179,7 +179,9 @@ def sync_versions(self, request, **kwargs):  # noqa: D205
 
         # If the currently highest non-prerelease version is active, then make
         # the new latest version active as well.
-        old_highest_version = determine_stable_version(project.versions.all())
+        old_highest_version = determine_stable_version(
+            project.versions.exclude(type=PULL_REQUEST)
+        )
         if old_highest_version is not None:
             activate_new_stable = old_highest_version.active
         else:

readthedocs/builds/models.py

@@ -133,7 +133,9 @@ def __str__(self):
     @property
     def ref(self):
         if self.slug == STABLE:
-            stable = determine_stable_version(self.project.versions.all())
+            stable = determine_stable_version(
+                self.project.versions.exclude(type=PULL_REQUEST)
+            )
             if stable:
                 return stable.slug
 

readthedocs/projects/models.py

@@ -20,7 +20,7 @@
 from taggit.managers import TaggableManager
 
 from readthedocs.api.v2.client import api
-from readthedocs.builds.constants import LATEST, STABLE
+from readthedocs.builds.constants import LATEST, STABLE, PULL_REQUEST
 from readthedocs.core.resolver import resolve, resolve_domain
 from readthedocs.core.utils import broadcast, slugify
 from readthedocs.projects import constants
@@ -931,7 +931,7 @@ def update_stable_version(self):
         Return ``None`` if no update was made or if there is no version on the
         project that can be considered stable.
         """
-        versions = self.versions.all()
+        versions = self.versions.exclude(type=PULL_REQUEST)
         new_stable = determine_stable_version(versions)
         if new_stable:
             current_stable = self.get_stable_version()