External version name added

Author: saadmk11

readthedocs/builds/managers.py

@@ -149,24 +149,24 @@ class InternalBuildManagerBase(BuildManagerBase):
     """
     Build manager that only includes internal version builds.
 
-    It will exclude PULL_REQUEST type Version builds from the queries
+    It will exclude pull request/merge request version builds from the queries
     and only include BRANCH, TAG, UNKONWN type Version builds.
     """
 
     def get_queryset(self):
-        return super().get_queryset().exclude(version__type=PULL_REQUEST)
+        return super().get_queryset().exclude(version__type=EXTERNAL)
 
 
 class ExternalBuildManagerBase(BuildManagerBase):
 
     """
     Build manager that only includes external version builds.
 
-    It will only include PULL_REQUEST type Versions builds in the queries.
+    It will only include pull request/merge request version builds in the queries.
     """
 
     def get_queryset(self):
-        return super().get_queryset().filter(version__type=PULL_REQUEST)
+        return super().get_queryset().filter(version__type=EXTERNAL)
 
 
 class BuildManager(SettingsOverrideObject):

readthedocs/builds/models.py

@@ -638,7 +638,7 @@ class Build(models.Model):
     objects = BuildManager.from_queryset(BuildQuerySet)()
     # Only include BRANCH, TAG, UNKONWN type Version builds.
     internal = InternalBuildManager.from_queryset(BuildQuerySet)()
-    # Only include PULL_REQUEST type Version builds.
+    # Only include EXTERNAL type Version builds.
     external = ExternalBuildManager.from_queryset(BuildQuerySet)()
 
     CONFIG_KEY = '__config'

readthedocs/rtd_tests/tests/test_managers.py

@@ -134,12 +134,12 @@ def setUp(self):
         self.client.login(username='test_user', password='test')
         self.pip = Project.objects.get(slug='pip')
         print(self.pip.versions.all())
-        # Create a External Version and build. ie: PULL_REQUEST type Version.
+        # Create a External Version and build. ie: pull/merge request Version.
         self.pr_version = get(
             Version,
             project=self.pip,
             active=True,
-            type=PULL_REQUEST,
+            type=EXTERNAL,
             privacy_level=PUBLIC
         )
         self.pr_version_build = get(
@@ -154,15 +154,15 @@ def setUp(self):
             version=self.pip.versions.get(slug='0.8')
         )
 
-        self.internal_builds = Build.objects.exclude(version__type=PULL_REQUEST)
+        self.internal_builds = Build.objects.exclude(version__type=EXTERNAL)
 
 
 class TestInternalBuildManager(TestBuildManagerBase):
 
     """
     Queries using Internal Manager should only include Internal Version builds.
 
-    It will exclude PULL_REQUEST type Version builds from the queries
+    It will exclude pull/merge request Version builds from the queries
     and only include BRANCH, TAG, UNKONWN type Versions.
     """
 
@@ -187,7 +187,7 @@ class TestExternalBuildManager(TestBuildManagerBase):
     """
     Queries using External Manager should only include External Version builds.
 
-    It will only include PULL_REQUEST type Version builds in the queries.
+    It will only include pull/merge request Version builds in the queries.
     """
 
     def test_external_build_manager_with_all(self):

readthedocs/rtd_tests/tests/test_project.py

@@ -162,7 +162,7 @@ def test_update_stable_version_excludes_pr_versions(self):
 
     def test_has_good_build_excludes_pr_versions(self):
         # Delete all versions excluding PR Versions.
-        self.pip.versions.exclude(type=PULL_REQUEST).delete()
+        self.pip.versions.exclude(type=EXTERNAL).delete()
         # Test that PR Version is not considered for has_good_build.
         self.assertFalse(self.pip.has_good_build)
 

readthedocs/rtd_tests/tests/test_views.py

@@ -7,7 +7,7 @@
 from django.urls import reverse
 from django_dynamic_fixture import get, new
 
-from readthedocs.builds.constants import LATEST, PULL_REQUEST
+from readthedocs.builds.constants import LATEST, EXTERNAL
 from readthedocs.builds.models import Build, Version
 from readthedocs.core.permissions import AdminPermission
 from readthedocs.projects.forms import UpdateProjectForm
@@ -283,7 +283,7 @@ def test_build_list_does_not_include_pr_versions(self):
             Version,
             project = self.pip,
             active = True,
-            type = PULL_REQUEST,
+            type = EXTERNAL,
         )
         pr_version_build = get(
             Build,