Merge branch 'master' of github.com:rtfd/readthedocs.org into update-migration

Author: ericholscher

readthedocs/builds/admin.py

@@ -2,7 +2,7 @@
 
 from __future__ import absolute_import
 from django.contrib import admin
-from readthedocs.builds.models import Build, VersionAlias, Version, BuildCommandResult
+from readthedocs.builds.models import Build, Version, BuildCommandResult
 from guardian.admin import GuardedModelAdmin
 
 
@@ -32,5 +32,4 @@ class VersionAdmin(GuardedModelAdmin):
 
 
 admin.site.register(Build, BuildAdmin)
-admin.site.register(VersionAlias)
 admin.site.register(Version, VersionAdmin)

readthedocs/builds/forms.py

@@ -11,27 +11,8 @@
 from django import forms
 from django.utils.translation import ugettext_lazy as _
 
-from readthedocs.builds.models import Version, VersionAlias
+from readthedocs.builds.models import Version
 from readthedocs.core.utils import trigger_build
-from readthedocs.projects.models import Project
-
-
-class AliasForm(forms.ModelForm):
-
-    class Meta(object):
-        model = VersionAlias
-        fields = (
-            'project',
-            'from_slug',
-            'to_slug',
-            'largest',
-        )
-
-    def __init__(self, instance=None, *args, **kwargs):  # noqa
-        super(AliasForm, self).__init__(instance=instance, *args, **kwargs)
-        if instance:
-            self.fields['project'].queryset = (Project.objects
-                                               .filter(pk=instance.project.pk))
 
 
 class VersionForm(forms.ModelForm):

readthedocs/builds/migrations/0005_remove-version-alias.py

@@ -0,0 +1,58 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.13 on 2018-10-17 04:20
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import readthedocs.builds.version_slug
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('builds', '0004_add-apiversion-proxy-model'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='versionalias',
+            name='project',
+        ),
+        migrations.AlterField(
+            model_name='build',
+            name='error',
+            field=models.TextField(blank=True, default='', verbose_name='Error'),
+        ),
+        migrations.AlterField(
+            model_name='build',
+            name='output',
+            field=models.TextField(blank=True, default='', verbose_name='Output'),
+        ),
+        migrations.AlterField(
+            model_name='build',
+            name='state',
+            field=models.CharField(choices=[('triggered', 'Triggered'), ('cloning', 'Cloning'), ('installing', 'Installing'), ('building', 'Building'), ('finished', 'Finished')], default='finished', max_length=55, verbose_name='State'),
+        ),
+        migrations.AlterField(
+            model_name='build',
+            name='type',
+            field=models.CharField(choices=[('html', 'HTML'), ('pdf', 'PDF'), ('epub', 'Epub'), ('man', 'Manpage'), ('dash', 'Dash')], default='html', max_length=55, verbose_name='Type'),
+        ),
+        migrations.AlterField(
+            model_name='version',
+            name='privacy_level',
+            field=models.CharField(choices=[('public', 'Public'), ('protected', 'Protected'), ('private', 'Private')], default='public', help_text='Level of privacy for this Version.', max_length=20, verbose_name='Privacy Level'),
+        ),
+        migrations.AlterField(
+            model_name='version',
+            name='slug',
+            field=readthedocs.builds.version_slug.VersionSlugField(db_index=True, max_length=255, populate_from='verbose_name', verbose_name='Slug'),
+        ),
+        migrations.AlterField(
+            model_name='version',
+            name='type',
+            field=models.CharField(choices=[('branch', 'Branch'), ('tag', 'Tag'), ('unknown', 'Unknown')], default='unknown', max_length=20, verbose_name='Type'),
+        ),
+        migrations.DeleteModel(
+            name='VersionAlias',
+        ),
+    ]

readthedocs/builds/models.py

@@ -404,27 +404,6 @@ def save(self, *args, **kwargs):
         return 0
 
 
-@python_2_unicode_compatible
-class VersionAlias(models.Model):
-
-    """Alias for a ``Version``."""
-
-    project = models.ForeignKey(
-        Project, verbose_name=_('Project'), related_name='aliases')
-    from_slug = models.CharField(_('From slug'), max_length=255, default='')
-    to_slug = models.CharField(
-        _('To slug'), max_length=255, default='', blank=True)
-    largest = models.BooleanField(_('Largest'), default=False)
-
-    def __str__(self):
-        return ugettext(
-            'Alias for {project}: {_from} -> {to}'.format(
-                project=self.project,
-                _from=self.from_slug,
-                to=self.to_slug,
-            ))
-
-
 @python_2_unicode_compatible
 class Build(models.Model):