Updated Django and squashed migraitons.

cvat-ai · Nov 7, 2018 · c4fcbbe · c4fcbbe
1 parent b4925b8
commit c4fcbbe
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 40 deletions.
diff --git a/...ine/migrations/0013_auto_20181031_1554.py → ...tions/0013_auth_no_default_permissions.py b/...ine/migrations/0013_auto_20181031_1554.py → ...tions/0013_auth_no_default_permissions.py
@@ -1,4 +1,4 @@
-# Generated by Django 2.0.9 on 2018-10-31 12:54
+# Generated by Django 2.0.9 on 2018-11-07 12:25
 
 from django.conf import settings
 from django.db import migrations, models
@@ -8,8 +8,8 @@
 class Migration(migrations.Migration):
 
     dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
         ('engine', '0012_auto_20181025_1618'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [
@@ -93,11 +93,26 @@ class Migration(migrations.Migration):
         migrations.AddField(
             model_name='task',
             name='assignee',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='assignees', to=settings.AUTH_USER_MODEL),
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='assignees', to=settings.AUTH_USER_MODEL),
         ),
         migrations.AlterField(
             model_name='task',
             name='owner',
             field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='owners', to=settings.AUTH_USER_MODEL),
         ),
+        migrations.AlterField(
+            model_name='job',
+            name='assignee',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AlterField(
+            model_name='task',
+            name='bug_tracker',
+            field=models.CharField(blank=True, default='', max_length=2000),
+        ),
+        migrations.AlterField(
+            model_name='task',
+            name='owner',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='owners', to=settings.AUTH_USER_MODEL),
+        ),
     ]
diff --git a/cvat/apps/engine/migrations/0014_auto_20181101_1725.py b/cvat/apps/engine/migrations/0014_auto_20181101_1725.py
diff --git a/cvat/requirements/base.txt b/cvat/requirements/base.txt
@@ -1,5 +1,5 @@
 click==6.7
-Django==2.0.9
+Django==2.1.3
 django-appconf==1.0.2
 django-auth-ldap==1.4.0
 django-cacheops==4.0.6
@@ -21,7 +21,7 @@ rq==0.10.0
 scipy==1.0.1
 sqlparse==0.2.4
 django-sendfile==0.3.11
-dj-pagination==2.3.2
+dj-pagination==2.4.0
 python-logstash==0.4.6
 django-revproxy==0.9.15
 rules==2.0