Merge pull request #4 from setton/master

Squash migrations
This commit is contained in:
Nicolas Setton
2017-09-07 09:14:03 -04:00
committed by GitHub
2 changed files with 15 additions and 26 deletions

View File

@@ -1,23 +0,0 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11 on 2017-05-05 17:06
from __future__ import unicode_literals
from django.db import migrations, models
class Migration(migrations.Migration):
initial = True
dependencies = [
]
operations = [
migrations.CreateModel(
name='Program',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('code', models.TextField()),
],
),
]

View File

@@ -1,5 +1,5 @@
# -*- coding: utf-8 -*-
# Generated by Django 1.11 on 2017-05-06 01:37
# Generated by Django 1.11.4 on 2017-09-06 20:11
from __future__ import unicode_literals
from django.db import migrations, models
@@ -7,8 +7,9 @@ from django.db import migrations, models
class Migration(migrations.Migration):
initial = True
dependencies = [
('app', '0001_initial'),
]
operations = [
@@ -24,7 +25,7 @@ class Migration(migrations.Migration):
name='Resource',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('name', models.TextField()),
('basename', models.TextField()),
('contents', models.TextField()),
],
),
@@ -36,4 +37,15 @@ class Migration(migrations.Migration):
('output', models.TextField()),
],
),
migrations.AddField(
model_name='example',
name='resources',
field=models.ManyToManyField(to=b'app.Resource'),
),
migrations.AddField(
model_name='example',
name='original_dir',
field=models.TextField(default=''),
preserve_default=False,
),
]