From d81fe2f457081fc6adabeb4027eee85df562173d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20KANSCHINE?= Date: Thu, 9 Nov 2017 19:52:01 +0100 Subject: [PATCH] Remove django-uuidfield requirement, as it's already intregrated into Django 1.8, closes #42 --- openduty/models.py | 3 +-- requirements.txt | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/openduty/models.py b/openduty/models.py index 736bcf4..1c56004 100644 --- a/openduty/models.py +++ b/openduty/models.py @@ -8,7 +8,6 @@ from django.utils.translation import ugettext_lazy as _ from django.utils.encoding import python_2_unicode_compatible from django.contrib.auth.models import User -from uuidfield import UUIDField from django.core.exceptions import ValidationError from schedule.models import Calendar from django.contrib.auth import models as auth_models @@ -67,7 +66,7 @@ class Service(models.Model): Incidents are representations of a malfunction in the system. """ name = models.CharField(max_length=80, unique=True) - id = UUIDField(primary_key=True, auto=True) + id = models.UUIDField(primary_key=True, default=uuid.uuid4) retry = models.IntegerField(blank=True, null=True) policy = models.ForeignKey(SchedulePolicy, blank=True, null=True) escalate_after = models.IntegerField(blank=True, null=True) diff --git a/requirements.txt b/requirements.txt index bd6dbfa..7d9cfba 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,7 +7,6 @@ django-annoying==0.8.2 django-auth-ldap==1.2.6 django-celery==3.1.16 django-scheduler==0.7.5 -django-uuidfield==0.5.0 djangorestframework==3.1.3 django-tables2-simplefilter==0.1 django-tables2==1.0.4