[buildinfo.debian.net] 01/01: Drop raw_text fields now; we've moved them to default_storage (S3)

[Chris Lamb]

This is an automated email from the git hooks/post-receive script.

lamby pushed a commit to branch master
in repository buildinfo.debian.net.

commit a2e587d1ef66879d9296c58189c9695a3e7bfb43
Author: Chris Lamb <lamby at debian.org>
Date:   Wed Feb 8 10:12:09 2017 +1300

    Drop raw_text fields now; we've moved them to default_storage (S3)
    
    Signed-off-by: Chris Lamb <lamby at debian.org>
---
 .../migrations/0007_remove_submission_raw_text.py  | 19 +++++++++++++++++
 bidb/buildinfo/buildinfo_submissions/models.py     |  3 ---
 bidb/buildinfo/buildinfo_submissions/views.py      |  4 ----
 .../migrations/0004_remove_buildinfo_raw_text.py   | 19 +++++++++++++++++
 bidb/buildinfo/models.py                           |  3 ---
 bidb/buildinfo/views.py                            |  4 ----
 .../commands/move_raw_text_to_storage.py           | 24 ----------------------
 7 files changed, 38 insertions(+), 38 deletions(-)

diff --git a/bidb/buildinfo/buildinfo_submissions/migrations/0007_remove_submission_raw_text.py b/bidb/buildinfo/buildinfo_submissions/migrations/0007_remove_submission_raw_text.py
new file mode 100644
index 0000000..e2b9463
--- /dev/null
+++ b/bidb/buildinfo/buildinfo_submissions/migrations/0007_remove_submission_raw_text.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.11 on 2017-02-07 21:11
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('buildinfo_submissions', '0006_remove_submission_node'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='submission',
+            name='raw_text',
+        ),
+    ]
diff --git a/bidb/buildinfo/buildinfo_submissions/models.py b/bidb/buildinfo/buildinfo_submissions/models.py
index 22d7103..bc1083a 100644
--- a/bidb/buildinfo/buildinfo_submissions/models.py
+++ b/bidb/buildinfo/buildinfo_submissions/models.py
@@ -21,9 +21,6 @@ class Submission(models.Model):
 
     key = models.ForeignKey('keys.Key', related_name='submissions')
 
-    # Deprecated
-    raw_text = models.TextField()
-
     created = models.DateTimeField(default=datetime.datetime.utcnow)
 
     class Meta:
diff --git a/bidb/buildinfo/buildinfo_submissions/views.py b/bidb/buildinfo/buildinfo_submissions/views.py
index 222f8ec..d5703a0 100644
--- a/bidb/buildinfo/buildinfo_submissions/views.py
+++ b/bidb/buildinfo/buildinfo_submissions/views.py
@@ -15,9 +15,5 @@ def view(request, sha1, filename, slug):
     if submission.buildinfo.get_filename() != filename:
         return redirect(submission)
 
-    # Legacy
-    if submission.raw_text:
-        return HttpResponse(submission.raw_text, content_type='text/plain')
-
     with default_storage.open(submission.get_storage_name()) as f:
         return HttpResponse(f, content_type='text/plain')
diff --git a/bidb/buildinfo/migrations/0004_remove_buildinfo_raw_text.py b/bidb/buildinfo/migrations/0004_remove_buildinfo_raw_text.py
new file mode 100644
index 0000000..8f9d177
--- /dev/null
+++ b/bidb/buildinfo/migrations/0004_remove_buildinfo_raw_text.py
@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.11 on 2017-02-07 21:11
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('buildinfo', '0003_auto_20170119_0258'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='buildinfo',
+            name='raw_text',
+        ),
+    ]
diff --git a/bidb/buildinfo/models.py b/bidb/buildinfo/models.py
index 31f0fde..4bae6fe 100644
--- a/bidb/buildinfo/models.py
+++ b/bidb/buildinfo/models.py
@@ -27,9 +27,6 @@ class Buildinfo(models.Model):
 
     environment = models.TextField()
 
-    # Deprecated
-    raw_text = models.TextField()
-
     created = models.DateTimeField(default=datetime.datetime.utcnow)
 
     class Meta:
diff --git a/bidb/buildinfo/views.py b/bidb/buildinfo/views.py
index c4fbff7..d055029 100644
--- a/bidb/buildinfo/views.py
+++ b/bidb/buildinfo/views.py
@@ -23,9 +23,5 @@ def view(request, sha1, filename=None):
 def raw_text(request, sha1, filename=None):
     buildinfo = get_object_or_404(Buildinfo, sha1=sha1)
 
-    # Legacy
-    if buildinfo.raw_text:
-        return HttpResponse(buildinfo.raw_text, content_type='text/plain')
-
     with default_storage.open(buildinfo.get_storage_name()) as f:
         return HttpResponse(f, content_type='text/plain')
diff --git a/bidb/utils/management/commands/move_raw_text_to_storage.py b/bidb/utils/management/commands/move_raw_text_to_storage.py
deleted file mode 100644
index 72202a4..0000000
--- a/bidb/utils/management/commands/move_raw_text_to_storage.py
+++ /dev/null
@@ -1,24 +0,0 @@
-from django.db import transaction
-from django.core.files.base import ContentFile
-from django.core.files.storage import default_storage
-from django.core.management.base import BaseCommand
-
-from bidb.buildinfo.models import Buildinfo
-from bidb.buildinfo.buildinfo_submissions.models import Submission
-
-class Command(BaseCommand):
-    def handle(self, **options):
-        print "Migrating buildinfo.Buildinfo"
-        for x in Buildinfo.objects.exclude(raw_text=''):
-            self.handle_instance(x)
-
-        print "Migrating buildinfo_submissions.Submission"
-        for x in Submission.objects.exclude(raw_text=''):
-            self.handle_instance(x)
-
-    @transaction.atomic
-    def handle_instance(self, x):
-        print "Saving to {}".format(x.get_storage_name())
-        default_storage.save(x.get_storage_name(), ContentFile(x.raw_text))
-        x.raw_text = ''
-        x.save(update_fields=('raw_text',))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/buildinfo.debian.net.git