Use poetry for dependency management

This commit is contained in:
Sonny 2020-04-13 17:05:46 +02:00
parent cda2654573
commit e495d7c188
21 changed files with 1252 additions and 75 deletions

View file

@ -1,5 +1,5 @@
#!/bin/bash
# This file should only be used in conjuction with docker-compose
python /app/src/manage.py migrate
python /app/src/manage.py runserver 0.0.0.0:8000
poetry run /app/src/manage.py migrate
poetry run /app/src/manage.py runserver 0.0.0.0:8000

View file

@ -116,7 +116,7 @@ class Migration(migrations.Migration):
blank=True,
editable=False,
null=True,
on_delete="collection task",
on_delete=models.SET_NULL,
to="django_celery_beat.PeriodicTask",
),
),
@ -125,7 +125,7 @@ class Migration(migrations.Migration):
models.ForeignKey(
blank=True,
null=True,
on_delete="collection schedule",
on_delete=models.SET_NULL,
to="django_celery_beat.IntervalSchedule",
),
),

View file

@ -15,7 +15,7 @@ class Migration(migrations.Migration):
blank=True,
editable=False,
null=True,
on_delete="collection task",
on_delete=models.SET_NULL,
to="django_celery_beat.PeriodicTask",
),
)

View file

@ -32,6 +32,8 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name="collectionrule",
name="user",
field=models.ForeignKey(on_delete="Owner", to=settings.AUTH_USER_MODEL),
field=models.ForeignKey(
on_delete=models.CASCADE, to=settings.AUTH_USER_MODEL
),
),
]

View file

@ -13,7 +13,9 @@ class Migration(migrations.Migration):
model_name="collectionrule",
name="user",
field=models.ForeignKey(
on_delete="Owner", related_name="rules", to=settings.AUTH_USER_MODEL
on_delete=models.CASCADE,
related_name="rules",
to=settings.AUTH_USER_MODEL,
),
)
]

View file

@ -0,0 +1,27 @@
# Generated by Django 3.0.5 on 2020-04-12 19:55
import django.db.models.deletion
from django.conf import settings
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
("collection", "0005_auto_20200303_1932"),
]
operations = [
migrations.AlterField(
model_name="collectionrule",
name="user",
field=models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="rules",
to=settings.AUTH_USER_MODEL,
verbose_name="Owner",
),
)
]

View file

@ -35,7 +35,12 @@ class CollectionRule(TimeStampedModel):
succeeded = models.BooleanField(default=False)
error = models.CharField(max_length=1024, blank=True, null=True)
user = models.ForeignKey("accounts.User", _("Owner"), related_name="rules")
user = models.ForeignKey(
"accounts.User",
verbose_name=_("Owner"),
related_name="rules",
on_delete=models.CASCADE,
)
def __str__(self):
return self.name

View file

@ -70,7 +70,9 @@ class Migration(migrations.Migration):
("name", models.CharField(max_length=50, unique=True)),
(
"user",
models.ForeignKey(on_delete="Owner", to=settings.AUTH_USER_MODEL),
models.ForeignKey(
on_delete=models.CASCADE, to=settings.AUTH_USER_MODEL
),
),
],
options={"verbose_name": "Category", "verbose_name_plural": "Categories"},

View file

@ -15,7 +15,7 @@ class Migration(migrations.Migration):
model_name="category",
name="user",
field=models.ForeignKey(
on_delete="Owner",
on_delete=models.CASCADE,
related_name="categories",
to=settings.AUTH_USER_MODEL,
),

View file

@ -0,0 +1,27 @@
# Generated by Django 3.0.5 on 2020-04-12 19:55
import django.db.models.deletion
from django.conf import settings
from django.db import migrations, models
class Migration(migrations.Migration):
dependencies = [
migrations.swappable_dependency(settings.AUTH_USER_MODEL),
("core", "0004_auto_20191116_1315"),
]
operations = [
migrations.AlterField(
model_name="category",
name="user",
field=models.ForeignKey(
on_delete=django.db.models.deletion.CASCADE,
related_name="categories",
to=settings.AUTH_USER_MODEL,
verbose_name="Owner",
),
)
]

View file

@ -27,7 +27,12 @@ class Post(TimeStampedModel):
class Category(TimeStampedModel):
name = models.CharField(max_length=50)
user = models.ForeignKey("accounts.User", _("Owner"), related_name="categories")
user = models.ForeignKey(
"accounts.User",
verbose_name=_("Owner"),
related_name="categories",
on_delete=models.CASCADE,
)
@property
def rule_ids(self):