Merge remote-tracking branch 'origin'

dpdispatcher/submission.py

@@ -318,6 +318,7 @@ def try_recover_from_json(self):
             submission_dict_str = self.machine.context.read_file(fname=submission_file_name)
             submission_dict = json.loads(submission_dict_str)
             submission = Submission.deserialize(submission_dict=submission_dict)
+            submission.bind_machine(machine=self.machine)
             if self == submission:
                 self.belonging_jobs = submission.belonging_jobs
                 self.bind_machine(machine=self.machine)

requirements.txt

@@ -1,3 +1,3 @@
 paramiko
-dargs
+dargs>=0.2.6
 oss2

scripts/script_gen_dargs_json.py

@@ -0,0 +1,16 @@
+from dpdispatcher import Resources, Task, Machine
+from dargs import ArgumentEncoder
+import json
+
+resources_dargs = Resources.arginfo()
+with open('dpdispatcher-resources.json', 'w') as f:
+    json.dump(resources_dargs, f, cls=ArgumentEncoder)
+
+machine_dargs = Machine.arginfo()
+with open('dpdispatcher-machine.json', 'w') as f:
+    json.dump(machine_dargs, f, cls=ArgumentEncoder)
+
+task_dargs = Task.arginfo()
+with open('dpdispatcher-task.json', 'w') as f:
+    json.dump(task_dargs, f, cls=ArgumentEncoder)
+

setup.py

@@ -19,7 +19,7 @@
 with open(path.join(NAME, '_date.py'), 'w') as fp :
     fp.write('date = \'%s\'' % today)
 
-install_requires=['paramiko', 'dargs', 'requests']
+install_requires=['paramiko', 'dargs>=0.2.6', 'requests']
 
 setuptools.setup(
     name=NAME,