Skip to content

Commit 9b15d28

Browse files
committed
Revert "Merge pull request #3336 from rtfd/use-active-for-stable"
This reverts commit 0d9c3fe, reversing changes made to 73b693c.
1 parent 47050f3 commit 9b15d28

File tree

3 files changed

+3
-5
lines changed

3 files changed

+3
-5
lines changed

readthedocs/projects/models.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -707,7 +707,7 @@ def update_stable_version(self):
707707
if current_stable:
708708
identifier_updated = (
709709
new_stable.identifier != current_stable.identifier)
710-
if identifier_updated and current_stable.active:
710+
if identifier_updated and current_stable.machine:
711711
log.info(
712712
"Update stable version: {project}:{version}".format(
713713
project=self.slug,

readthedocs/projects/views/private.py

+1
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,7 @@ def project_version_detail(request, project_slug, version_slug):
176176
log.info('Removing files for version %s', version.slug)
177177
broadcast(type='app', task=tasks.clear_artifacts, args=[version.pk])
178178
version.built = False
179+
version.machine = False
179180
version.save()
180181
url = reverse('project_version_list', args=[project.slug])
181182
return HttpResponseRedirect(url)

readthedocs/rtd_tests/tests/test_sync_versions.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -349,9 +349,6 @@ def test_update_stable_version(self):
349349
self.assertEqual(version_stable.identifier, '1.0.0')
350350

351351
def test_update_inactive_stable_version(self):
352-
"""
353-
Test that stable doesn't get updated when it isn't active
354-
"""
355352
version_post_data = {
356353
'branches': [
357354
{
@@ -391,7 +388,7 @@ def test_update_inactive_stable_version(self):
391388

392389
version_stable = Version.objects.get(slug=STABLE)
393390
self.assertFalse(version_stable.active)
394-
self.assertEqual(version_stable.identifier, '0.9')
391+
self.assertEqual(version_stable.identifier, '1.0.0')
395392

396393
def test_stable_version_tags_over_branches(self):
397394
version_post_data = {

0 commit comments

Comments
 (0)