Merge pull request #3336 from rtfd/use-active-for-stable

Change stable version switching to respect `active`

Author: ericholscher

readthedocs/projects/models.py

@@ -707,7 +707,7 @@ def update_stable_version(self):
             if current_stable:
                 identifier_updated = (
                     new_stable.identifier != current_stable.identifier)
-                if identifier_updated and current_stable.machine:
+                if identifier_updated and current_stable.active:
                     log.info(
                         "Update stable version: {project}:{version}".format(
                             project=self.slug,

readthedocs/projects/views/private.py

@@ -176,7 +176,6 @@ def project_version_detail(request, project_slug, version_slug):
                 log.info('Removing files for version %s', version.slug)
                 broadcast(type='app', task=tasks.clear_artifacts, args=[version.pk])
                 version.built = False
-                version.machine = False
                 version.save()
         url = reverse('project_version_list', args=[project.slug])
         return HttpResponseRedirect(url)

readthedocs/rtd_tests/tests/test_sync_versions.py

@@ -349,6 +349,9 @@ def test_update_stable_version(self):
         self.assertEqual(version_stable.identifier, '1.0.0')
 
     def test_update_inactive_stable_version(self):
+        """
+        Test that stable doesn't get updated when it isn't active
+        """
         version_post_data = {
             'branches': [
                 {
@@ -388,7 +391,7 @@ def test_update_inactive_stable_version(self):
 
         version_stable = Version.objects.get(slug=STABLE)
         self.assertFalse(version_stable.active)
-        self.assertEqual(version_stable.identifier, '1.0.0')
+        self.assertEqual(version_stable.identifier, '0.9')
 
     def test_stable_version_tags_over_branches(self):
         version_post_data = {