Thanks to visit codestin.com
Credit goes to github.com

Skip to content

2.0 with migrations #42

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.

Sign up for GitHub

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

Merged
merged 21 commits into from
Aug 19, 2021
Merged

2.0 with migrations #42

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
97312b5
Make tests run on sqlite by default
j4mie Apr 5, 2021
40ebd81
Remove unnecessary setting
j4mie Apr 5, 2021
ae52e3b
Remove jsonfield dependency and switch to enum choices
j4mie Apr 5, 2021
7df7d40
Remove dependency on simplesignals
j4mie Apr 5, 2021
3b5f5b8
Remove requirements.txt and stuff from install_requires
j4mie Apr 5, 2021
9f78d38
Add supported django versions and sqlite url to CI
j4mie Apr 5, 2021
85acafd
Remove unused create_job management command
j4mie Apr 5, 2021
dd283b3
Remove unused JobSerializer
j4mie Apr 5, 2021
9efebb2
Remove unused python 2 compat import
j4mie Apr 5, 2021
54664b2
Add upgrade notes to README
j4mie Apr 5, 2021
ec2b860
Bump version
j4mie Apr 5, 2021
27fd096
Add pypi publishing workflow
j4mie Apr 5, 2021
72c2994
Quote YAML properly
j4mie Apr 5, 2021
30444b3
Really quote YAML properly
j4mie Apr 5, 2021
f809529
Use newer way of determining if instance is new, saves a query
j4mie Apr 5, 2021
9e008f0
Remove python2 compat syntax
j4mie Apr 5, 2021
ec3822f
Add note on Django version support
j4mie Apr 6, 2021
31e0e00
Django 3.2 final
j4mie Apr 6, 2021
908823c
Ensure signal handler takes correct arguments
j4mie May 14, 2021
2e25603
Merge remote-tracking branch 'origin/2.0' into 2.0
j4mie May 14, 2021
f5bb1dc
Reinstate migrations for upgrading from 1.x to 2.0
j4mie Aug 18, 2021
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
Prev Previous commit
Next Next commit
Remove jsonfield dependency and switch to enum choices
  • Loading branch information
@j4mie
j4mie committed Apr 5, 2021
commit ae52e3b824791700f0f88698430129e88cf5efc2
43 changes: 21 additions & 22 deletions django_dbq/migrations/0001_initial.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,13 @@
# -*- coding: utf-8 -*-
from __future__ import unicode_literals
# Generated by Django 3.2rc1 on 2021-04-05 14:31

from django.db import models, migrations
import jsonfield.fields
from django.db import migrations, models
import uuid

from django.db.models import UUIDField


class Migration(migrations.Migration):

initial = True

dependencies = []

operations = [
Expand All @@ -18,38 +16,39 @@ class Migration(migrations.Migration):
fields=[
(
"id",
UUIDField(
serialize=False,
editable=False,
models.UUIDField(
default=uuid.uuid4,
editable=False,
primary_key=True,
serialize=False,
),
),
("created", models.DateTimeField(db_index=True, auto_now_add=True)),
("created", models.DateTimeField(auto_now_add=True, db_index=True)),
("modified", models.DateTimeField(auto_now=True)),
("name", models.CharField(max_length=100)),
(
"state",
models.CharField(
db_index=True,
max_length=20,
default="NEW",
choices=[
("NEW", "NEW"),
("READY", "READY"),
("PROCESSING", "PROCESSING"),
("FAILED", "FAILED"),
("COMPLETE", "COMPLETE"),
("NEW", "New"),
("READY", "Ready"),
("PROCESSING", "Processing"),
("FAILED", "Failed"),
("COMPLETE", "Complete"),
],
db_index=True,
default="NEW",
max_length=20,
),
),
("next_task", models.CharField(max_length=100, blank=True)),
("workspace", jsonfield.fields.JSONField(null=True)),
("next_task", models.CharField(blank=True, max_length=100)),
("workspace", models.JSONField(null=True)),
(
"queue_name",
models.CharField(db_index=True, max_length=20, default="default"),
models.CharField(db_index=True, default="default", max_length=20),
),
("priority", models.SmallIntegerField(db_index=True, default=0)),
],
options={"ordering": ["-created"],},
options={"ordering": ["-priority", "created"],},
),
]
15 changes: 0 additions & 15 deletions django_dbq/migrations/0002_auto_20151016_1027.py
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions django_dbq/migrations/0003_auto_20180713_1000.py
View file
Open in desktop

This file was deleted.

15 changes: 3 additions & 12 deletions django_dbq/models.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,7 @@
get_failure_hook_name,
get_creation_hook_name,
)
from jsonfield import JSONField
from django.db.models import UUIDField, Count
from django.db.models import JSONField, UUIDField, Count, TextChoices
import datetime
import logging
import uuid
Expand Down Expand Up @@ -74,27 +73,19 @@ def to_process(self, queue_name):


class Job(models.Model):
class STATES:
class STATES(TextChoices):
NEW = "NEW"
READY = "READY"
PROCESSING = "PROCESSING"
FAILED = "FAILED"
COMPLETE = "COMPLETE"

STATE_CHOICES = [
(STATES.NEW, "NEW"),
(STATES.READY, "READY"),
(STATES.PROCESSING, "PROCESSING"),
(STATES.FAILED, "FAILED"),
(STATES.COMPLETE, "COMPLETE"),
]

id = UUIDField(primary_key=True, default=uuid.uuid4, editable=False)
created = models.DateTimeField(auto_now_add=True, db_index=True)
modified = models.DateTimeField(auto_now=True)
name = models.CharField(max_length=100)
state = models.CharField(
max_length=20, choices=STATE_CHOICES, default=STATES.NEW, db_index=True
max_length=20, choices=STATES.choices, default=STATES.NEW, db_index=True
)
next_task = models.CharField(max_length=100, blank=True)
workspace = JSONField(null=True)
Expand Down