Skip to content
Snippets Groups Projects
Commit 86efba1d authored by Jorrit Schaap's avatar Jorrit Schaap
Browse files

TMSS-215: fixed tests and migrations

parent c1a04bdf
No related branches found
No related tags found
1 merge request!197Resolve TMSS-215
...@@ -17,7 +17,7 @@ import pyxb.utils.six as _six ...@@ -17,7 +17,7 @@ import pyxb.utils.six as _six
_GenerationUID = pyxb.utils.utility.UniqueIdentifier('urn:uuid:84ba4972-d87c-11ea-a91f-0242ac110001') _GenerationUID = pyxb.utils.utility.UniqueIdentifier('urn:uuid:84ba4972-d87c-11ea-a91f-0242ac110001')
   
# Version of PyXB used to generate the bindings # Version of PyXB used to generate the bindings
_PyXBVersion = '1.2.6' _PyXBVersion = '1.2.5'
# Generated bindings are not compatible across PyXB versions # Generated bindings are not compatible across PyXB versions
if pyxb.__version__ != _PyXBVersion: if pyxb.__version__ != _PyXBVersion:
raise pyxb.PyXBVersionError(_PyXBVersion) raise pyxb.PyXBVersionError(_PyXBVersion)
......
This diff is collapsed.
...@@ -106,8 +106,6 @@ class SubtaskTemplate(Template): ...@@ -106,8 +106,6 @@ class SubtaskTemplate(Template):
queue = BooleanField(default=False) queue = BooleanField(default=False)
realtime = BooleanField(default=False) realtime = BooleanField(default=False)
class Meta:
pass
class DefaultSubtaskTemplate(BasicCommon): class DefaultSubtaskTemplate(BasicCommon):
name = CharField(max_length=128, unique=True) name = CharField(max_length=128, unique=True)
...@@ -115,8 +113,7 @@ class DefaultSubtaskTemplate(BasicCommon): ...@@ -115,8 +113,7 @@ class DefaultSubtaskTemplate(BasicCommon):
class DataproductSpecificationsTemplate(Template): class DataproductSpecificationsTemplate(Template):
class Meta: pass
pass
class DefaultDataproductSpecificationsTemplate(BasicCommon): class DefaultDataproductSpecificationsTemplate(BasicCommon):
...@@ -125,8 +122,7 @@ class DefaultDataproductSpecificationsTemplate(BasicCommon): ...@@ -125,8 +122,7 @@ class DefaultDataproductSpecificationsTemplate(BasicCommon):
class DataproductFeedbackTemplate(Template): class DataproductFeedbackTemplate(Template):
class Meta: pass
pass
# todo: do we need to specify a default? # todo: do we need to specify a default?
......
...@@ -232,9 +232,6 @@ class Template(NamedCommon): ...@@ -232,9 +232,6 @@ class Template(NamedCommon):
class GeneratorTemplate(Template): class GeneratorTemplate(Template):
create_function = CharField(max_length=128, help_text='Python function to call to execute the generator.') create_function = CharField(max_length=128, help_text='Python function to call to execute the generator.')
class Meta:
pass
class DefaultGeneratorTemplate(BasicCommon): class DefaultGeneratorTemplate(BasicCommon):
name = CharField(max_length=128, unique=True) name = CharField(max_length=128, unique=True)
...@@ -251,9 +248,6 @@ class SchedulingUnitObservingStrategyTemplate(NamedCommon): ...@@ -251,9 +248,6 @@ class SchedulingUnitObservingStrategyTemplate(NamedCommon):
'This observation strategy template like a predefined recipe with all the correct settings, and defines which parameters the user can alter.') 'This observation strategy template like a predefined recipe with all the correct settings, and defines which parameters the user can alter.')
scheduling_unit_template = ForeignKey("SchedulingUnitTemplate", on_delete=PROTECT, null=False, help_text="") scheduling_unit_template = ForeignKey("SchedulingUnitTemplate", on_delete=PROTECT, null=False, help_text="")
class Meta:
constraints = [UniqueConstraint(fields=['name', 'version'], name='SchedulingUnitObservingStrategyTemplate_unique_name_version')]
def save(self, force_insert=False, force_update=False, using=None, update_fields=None): def save(self, force_insert=False, force_update=False, using=None, update_fields=None):
if self.template and self.scheduling_unit_template_id and self.scheduling_unit_template.schema: if self.template and self.scheduling_unit_template_id and self.scheduling_unit_template.schema:
validate_json_against_schema(self.template, self.scheduling_unit_template.schema) validate_json_against_schema(self.template, self.scheduling_unit_template.schema)
...@@ -262,8 +256,7 @@ class SchedulingUnitObservingStrategyTemplate(NamedCommon): ...@@ -262,8 +256,7 @@ class SchedulingUnitObservingStrategyTemplate(NamedCommon):
class SchedulingUnitTemplate(Template): class SchedulingUnitTemplate(Template):
class Meta: pass
pass
class DefaultSchedulingUnitTemplate(BasicCommon): class DefaultSchedulingUnitTemplate(BasicCommon):
...@@ -275,8 +268,6 @@ class TaskTemplate(Template): ...@@ -275,8 +268,6 @@ class TaskTemplate(Template):
validation_code_js = CharField(max_length=128, help_text='JavaScript code for additional (complex) validation.') validation_code_js = CharField(max_length=128, help_text='JavaScript code for additional (complex) validation.')
type = ForeignKey('TaskType', null=False, on_delete=PROTECT) type = ForeignKey('TaskType', null=False, on_delete=PROTECT)
class Meta:
pass
class DefaultTaskTemplate(BasicCommon): class DefaultTaskTemplate(BasicCommon):
name = CharField(max_length=128, unique=True) name = CharField(max_length=128, unique=True)
...@@ -284,8 +275,7 @@ class DefaultTaskTemplate(BasicCommon): ...@@ -284,8 +275,7 @@ class DefaultTaskTemplate(BasicCommon):
class TaskRelationSelectionTemplate(Template): class TaskRelationSelectionTemplate(Template):
class Meta: pass
pass
class DefaultTaskRelationSelectionTemplate(BasicCommon): class DefaultTaskRelationSelectionTemplate(BasicCommon):
name = CharField(max_length=128, unique=True) name = CharField(max_length=128, unique=True)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment