Skip to content

Commit

Permalink
Merge pull request #48 from unlimitedlabs/fix_warnings
Browse files Browse the repository at this point in the history
Eliminates orchestra-related warnings on startup.
  • Loading branch information
thisisdhaas committed Oct 16, 2015
2 parents e183074 + 6c0e7fe commit 7052ea7
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 5 deletions.
14 changes: 14 additions & 0 deletions orchestra/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,9 @@ class Certification(models.Model):
def __str__(self):
return '{}'.format(self.slug)

class Meta:
app_label = 'orchestra'


class Worker(models.Model):
"""
Expand All @@ -58,6 +61,9 @@ class Worker(models.Model):
def __str__(self):
return '{}'.format(self.user.username)

class Meta:
app_label = 'orchestra'


class WorkerCertification(models.Model):
"""
Expand All @@ -83,6 +89,7 @@ class WorkerCertification(models.Model):
obtaining a reviewer one.
"""
class Meta:
app_label = 'orchestra'
unique_together = ('certification', 'worker', 'task_class', 'role')

class TaskClass:
Expand Down Expand Up @@ -178,6 +185,9 @@ def __str__(self):
return '{} ({})'.format(str(self.workflow_slug),
self.short_description)

class Meta:
app_label = 'orchestra'


class Task(models.Model):
"""
Expand Down Expand Up @@ -220,6 +230,9 @@ class Status:
def __str__(self):
return '{} - {}'.format(str(self.project), str(self.step_slug))

class Meta:
app_label = 'orchestra'


class TaskAssignment(models.Model):
"""
Expand Down Expand Up @@ -253,6 +266,7 @@ class TaskAssignment(models.Model):
while those for human-type tasks must have one.
"""
class Meta:
app_label = 'orchestra'
unique_together = ('task', 'assignment_counter')

class SnapshotType:
Expand Down
6 changes: 1 addition & 5 deletions requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,7 @@
Django==1.8.3
jsonfield==1.0.0
django-compressor==1.5
# Upgrade to newer jsonview once they release it to avoid Django
# importlib deprecation warning. The jsonview project fixes the problem
# (https://github.com/jsocol/django-jsonview/commit/e7b8ae7da6fde829f1c4dcafc6635813213b5eb4)
# but hasn't yet packaged it on pypi.
django-jsonview==0.4.3
django-jsonview==0.5.0
requests==2.5.1
factory_boy==2.5.2
coverage==3.7.1
Expand Down

0 comments on commit 7052ea7

Please sign in to comment.