3 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/12c572b3021e/ Changeset: 12c572b3021e User: dannon Date: 2013-06-20 18:57:22 Summary: Handle version change notifications for workflows generated in addition to imported Affected #: 1 file diff -r 7362302b2c638d377931fa710d40ba2f86f25dba -r 12c572b3021e98f937dfd45adb997173a6373639 lib/galaxy/workflow/modules.py --- a/lib/galaxy/workflow/modules.py +++ b/lib/galaxy/workflow/modules.py @@ -246,6 +246,8 @@ return module_factory.from_dict(trans, from_json_string(step.config), secure=False) module = Class( trans, tool_id ) module.state = galaxy.tools.DefaultToolState() + if step.tool_version and (step.tool_version != tool.version): + module.version_changes.append("%s: using version '%s' instead of version '%s' indicated in this workflow." % (tool_id, tool.version, step.tool_version)) module.state.inputs = module.tool.params_from_strings( step.tool_inputs, trans.app, ignore_errors=True ) module.errors = step.tool_errors # module.post_job_actions = step.post_job_actions https://bitbucket.org/galaxy/galaxy-central/commits/89e7db1cd809/ Changeset: 89e7db1cd809 User: dannon Date: 2013-06-20 18:57:53 Summary: Merge Affected #: 1 file diff -r 12c572b3021e98f937dfd45adb997173a6373639 -r 89e7db1cd8098fd6191ab3b4af92e4af32e4c651 lib/galaxy/webapps/galaxy/api/provenance.py --- a/lib/galaxy/webapps/galaxy/api/provenance.py +++ b/lib/galaxy/webapps/galaxy/api/provenance.py @@ -43,7 +43,7 @@ item = item.copied_from_library_dataset_dataset_association return { "id" : trans.security.encode_id(item.id), - "uuid" : item.dataset.uuid, + "uuid" : ( lambda uuid: str( uuid ) if uuid else None )( item.dataset.uuid), "tool_id" : item.creating_job.tool_id, "parameters" : self._get_job_record(trans, item.creating_job, follow) } @@ -59,7 +59,7 @@ else: out[in_d.name] = { "id" : trans.security.encode_id(in_d.dataset.id), - "uuid" : in_d.dataset.dataset.uuid + "uuid" : ( lambda uuid: str( uuid ) if uuid else None )( in_d.dataset.dataset.uuid ) } return out https://bitbucket.org/galaxy/galaxy-central/commits/6090712e7f29/ Changeset: 6090712e7f29 Branch: provenance User: dannon Date: 2013-06-20 18:58:16 Summary: Close provenance branch Affected #: 0 files Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.