Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Hotfix merge from stoich branch #45

Merged
merged 6 commits into from
Sep 30, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,10 @@ jobs:
pip install flake8
flake8 . --count --select=E9,F63,F7,F82 --show-source --statistics
flake8 . --count --exit-zero --max-complexity=10 --max-line-length=127 --statistics
# - name: Run migrations
# run: |
# python manage.py makemigrations
# python manage.py migrate # Ensure migrations are applied
- name: Test with pytest
run: |
mv env.example .env
Expand Down
42 changes: 42 additions & 0 deletions materials/migrations/0128_auto_20240930_1321.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
# Generated by Django 3.1.14 on 2024-09-30 17:21

from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

dependencies = [
('materials', '0127_property_method'),
]

operations = [
migrations.AlterField(
model_name='dataset',
name='linked_to',
field=models.ManyToManyField(blank=True, related_name='_dataset_linked_to_+', to='materials.Dataset'),
),
migrations.AlterField(
model_name='system',
name='derived_to_from',
field=models.ManyToManyField(blank=True, related_name='_system_derived_to_from_+', to='materials.System'),
),
migrations.CreateModel(
name='System_Stoichiometry',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('stoichiometry', models.CharField(default='N/A', help_text='Please provide the stoichiometry value in the format: C:6,H:12,O:1', max_length=255)),
('system', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='materials.system')),
],
),
migrations.CreateModel(
name='Stoichiometry_Elements',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('element', models.CharField(max_length=1000)),
('string_value', models.CharField(default='0', max_length=1000)),
('float_value', models.FloatField(default=0.0)),
('system_stoichiometry', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.PROTECT, to='materials.system_stoichiometry')),
],
),
]
19 changes: 19 additions & 0 deletions materials/migrations/0129_auto_20240930_1403.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# Generated by Django 3.1.14 on 2024-09-30 18:03

from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

dependencies = [
('materials', '0128_auto_20240930_1321'),
]

operations = [
migrations.AlterField(
model_name='stoichiometry_elements',
name='system_stoichiometry',
field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='materials.system_stoichiometry'),
),
]
23 changes: 23 additions & 0 deletions materials/migrations/0130_auto_20240930_1456.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Generated by Django 3.1.14 on 2024-09-30 18:56

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('materials', '0129_auto_20240930_1403'),
]

operations = [
migrations.RemoveField(
model_name='system_stoichiometry',
name='system',
),
migrations.DeleteModel(
name='Stoichiometry_Elements',
),
migrations.DeleteModel(
name='System_Stoichiometry',
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# Generated by Django 3.1.14 on 2024-09-30 19:05

from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

dependencies = [
('materials', '0130_auto_20240930_1456'),
]

operations = [
migrations.CreateModel(
name='System_Stoichiometry',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('stoichiometry', models.CharField(default='N/A', help_text='Please provide the stoichiometry value in the format: C:6,H:12,O:1', max_length=255)),
('system', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='materials.system')),
],
),
migrations.CreateModel(
name='Stoichiometry_Elements',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('element', models.CharField(max_length=1000)),
('string_value', models.CharField(default='0', max_length=1000)),
('float_value', models.FloatField(default=0.0)),
('system_stoichiometry', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='materials.system_stoichiometry')),
],
),
]
23 changes: 23 additions & 0 deletions materials/migrations/0132_auto_20240930_1607.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# Generated by Django 3.1.14 on 2024-09-30 20:07

from django.db import migrations


class Migration(migrations.Migration):

dependencies = [
('materials', '0131_stoichiometry_elements_system_stoichiometry'),
]

operations = [
migrations.RemoveField(
model_name='system_stoichiometry',
name='system',
),
migrations.DeleteModel(
name='Stoichiometry_Elements',
),
migrations.DeleteModel(
name='System_Stoichiometry',
),
]
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# Generated by Django 3.1.14 on 2024-09-30 20:09

from django.db import migrations, models
import django.db.models.deletion


class Migration(migrations.Migration):

dependencies = [
('materials', '0132_auto_20240930_1607'),
]

operations = [
migrations.CreateModel(
name='System_Stoichiometry',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('stoichiometry', models.CharField(default='N/A', help_text='Please provide the stoichiometry value in the format: C:6,H:12,O:1', max_length=255)),
('system', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='materials.system')),
],
),
migrations.CreateModel(
name='Stoichiometry_Elements',
fields=[
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
('element', models.CharField(max_length=1000)),
('string_value', models.CharField(default='0', max_length=1000)),
('float_value', models.FloatField(default=0.0)),
('system_stoichiometry', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='materials.system_stoichiometry')),
],
),
]
Loading