Commit c98fbd86 authored by Stefano Alberto Russo's avatar Stefano Alberto Russo
Browse files

Merge branch 'fix/tests' into develop

parents be5e1c7f e3ba9c66

services/webapp/code/rosetta/core_app/migrations/0001_initial.py

+8 −4
Original line number Diff line number Diff line 
# Generated by Django 2.2.1 on 2020-05-28 15:12



from django.conf import settings

import django.contrib.postgres.fields.jsonb

from django.db import migrations, models

import django.db.models.deletion

import django.utils.timezone

import uuid



# Load database-dependent JSON field

if 'sqlite' in settings.DATABASES['default']['ENGINE']:

    from rosetta.core_app.fields import JSONField

else:

    from django.contrib.postgres.fields import JSONField



class Migration(migrations.Migration):
@@ -68,7 +72,7 @@ class Migration(migrations.Migration): 
                ('auth_user', models.CharField(blank=True, max_length=36, null=True, verbose_name='Task auth user')),

                ('auth_pass', models.CharField(blank=True, max_length=36, null=True, verbose_name='Task auth pass')),

                ('access_method', models.CharField(blank=True, max_length=36, null=True, verbose_name='Task access method')),

                ('computing_options', django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True)),

                ('computing_options', JSONField(blank=True, null=True)),

                ('computing', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='+', to='core_app.Computing')),

                ('container', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='+', to='core_app.Container')),

                ('user', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='+', to=settings.AUTH_USER_MODEL)),
@@ -108,7 +112,7 @@ class Migration(migrations.Migration): 
            name='ComputingUserConf',

            fields=[

                ('uuid', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),

                ('data', django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True)),

                ('data', JSONField(blank=True, null=True)),

                ('computing', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='+', to='core_app.Computing')),

                ('user', models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, related_name='+', to=settings.AUTH_USER_MODEL)),

            ],
@@ -117,7 +121,7 @@ class Migration(migrations.Migration): 
            name='ComputingSysConf',

            fields=[

                ('uuid', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),

                ('data', django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True)),

                ('data', JSONField(blank=True, null=True)),

                ('computing', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='+', to='core_app.Computing')),

            ],

        ),

services/webapp/code/rosetta/core_app/migrations/0007_auto_20211103_1228.py

+7 −2
Original line number Diff line number Diff line 
# Generated by Django 2.2.1 on 2021-11-03 12:28



import django.contrib.postgres.fields.jsonb

from django.conf import settings

from django.db import migrations, models



# Load database-dependent JSON field

if 'sqlite' in settings.DATABASES['default']['ENGINE']:

    from rosetta.core_app.fields import JSONField

else:

    from django.contrib.postgres.fields import JSONField



class Migration(migrations.Migration):
@@ -34,7 +39,7 @@ class Migration(migrations.Migration): 
        migrations.AlterField(

            model_name='task',

            name='computing_options',

            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True, verbose_name='Task computing options'),

            field=JSONField(blank=True, null=True, verbose_name='Task computing options'),

        ),

        migrations.AlterField(

            model_name='task',

services/webapp/code/rosetta/core_app/migrations/0009_auto_20211103_2256.py

+7 −2
Original line number Diff line number Diff line 
# Generated by Django 2.2.1 on 2021-11-03 22:56



import django.contrib.postgres.fields.jsonb

from django.conf import settings

from django.db import migrations, models



# Load database-dependent JSON field

if 'sqlite' in settings.DATABASES['default']['ENGINE']:

    from rosetta.core_app.fields import JSONField

else:

    from django.contrib.postgres.fields import JSONField



class Migration(migrations.Migration):
@@ -114,7 +119,7 @@ class Migration(migrations.Migration): 
        migrations.AlterField(

            model_name='task',

            name='computing_options',

            field=django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True, verbose_name='Computing options'),

            field=JSONField(blank=True, null=True, verbose_name='Computing options'),

        ),

        migrations.AlterField(

            model_name='task',

services/webapp/code/rosetta/core_app/migrations/0011_storage.py

+6 −2
Original line number Diff line number Diff line 
# Generated by Django 2.2.1 on 2021-11-08 14:45



from django.conf import settings

import django.contrib.postgres.fields.jsonb

from django.db import migrations, models

import django.db.models.deletion

import uuid



# Load database-dependent JSON field

if 'sqlite' in settings.DATABASES['default']['ENGINE']:

    from rosetta.core_app.fields import JSONField

else:

    from django.contrib.postgres.fields import JSONField



class Migration(migrations.Migration):
@@ -26,7 +30,7 @@ class Migration(migrations.Migration): 
                ('base_path', models.CharField(max_length=4096, verbose_name='Base path')),

                ('bind_path', models.CharField(max_length=4096, verbose_name='Bind path')),

                ('access_through_computing', models.BooleanField(default=False, verbose_name='Access through linked computing resource?')),

                ('config', django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True)),

                ('config', JSONField(blank=True, null=True)),

                ('computing', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='storages', to='core_app.Computing')),

                ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='+', to=settings.AUTH_USER_MODEL)),

            ],

services/webapp/code/rosetta/core_app/migrations/0013_auto_20211108_1529.py

+7 −2
Original line number Diff line number Diff line 
# Generated by Django 2.2.1 on 2021-11-08 15:29



import django.contrib.postgres.fields.jsonb

from django.conf import settings

from django.db import migrations, models

import django.db.models.deletion

import uuid



# Load database-dependent JSON field

if 'sqlite' in settings.DATABASES['default']['ENGINE']:

    from rosetta.core_app.fields import JSONField

else:

    from django.contrib.postgres.fields import JSONField



class Migration(migrations.Migration):
@@ -17,7 +22,7 @@ class Migration(migrations.Migration): 
            name='ComputingConf',

            fields=[

                ('uuid', models.UUIDField(default=uuid.uuid4, editable=False, primary_key=True, serialize=False)),

                ('data', django.contrib.postgres.fields.jsonb.JSONField(blank=True, null=True)),

                ('data', JSONField(blank=True, null=True)),

            ],

        ),

        migrations.RemoveField(