2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/56b077b51694/ Changeset: 56b077b51694 Branch: stable User: jmchilton Date: 2013-11-11 21:17:25 Summary: Revert original and documented handling of condor submission parameters. I modified the behavior unknowingly in 126d5c5b9a49. I am not sure what I was thinking when I redid the runner, perhaps I had seen an open Trello card and thought this was not implemented at all. My fault, this was implemented and looks like it was working. These should now work as documented again. Affected #: 2 files diff -r 4bd31fc8c523950dd2f6e96ef361cb7410021fdd -r 56b077b51694fba1dcb37044dc8f2c0ea8d8b9bf lib/galaxy/jobs/runners/condor.py --- a/lib/galaxy/jobs/runners/condor.py +++ b/lib/galaxy/jobs/runners/condor.py @@ -57,7 +57,7 @@ galaxy_id_tag = job_wrapper.get_id_tag() # get destination params - query_params = submission_params(**job_destination.params) + query_params = submission_params(prefix="", **job_destination.params) galaxy_slots = query_params.get('request_cpus', None) if galaxy_slots: galaxy_slots_statement = 'GALAXY_SLOTS="%s"; export GALAXY_SLOTS_CONFIGURED="1"' % galaxy_slots diff -r 4bd31fc8c523950dd2f6e96ef361cb7410021fdd -r 56b077b51694fba1dcb37044dc8f2c0ea8d8b9bf lib/galaxy/jobs/runners/util/condor/__init__.py --- a/lib/galaxy/jobs/runners/util/condor/__init__.py +++ b/lib/galaxy/jobs/runners/util/condor/__init__.py @@ -18,12 +18,12 @@ SUBMIT_PARAM_PREFIX = "submit_" -def submission_params(**kwds): +def submission_params(prefix=SUBMIT_PARAM_PREFIX, **kwds): submission_params = {} for key, value in kwds.iteritems(): key = key.lower() - if key.startswith(SUBMIT_PARAM_PREFIX): - condor_key = key[len(SUBMIT_PARAM_PREFIX):] + if key.startswith(prefix): + condor_key = key[len(prefix):] submission_params[condor_key] = value return submission_params https://bitbucket.org/galaxy/galaxy-central/commits/28469a503b56/ Changeset: 28469a503b56 User: jmchilton Date: 2013-11-11 21:17:55 Summary: Merge latest stable. Affected #: 2 files diff -r 43b42520bd5b89f5b0f281efcbc5513e501326cd -r 28469a503b56c374f8ec4730e276a89a6323cef9 lib/galaxy/jobs/runners/condor.py --- a/lib/galaxy/jobs/runners/condor.py +++ b/lib/galaxy/jobs/runners/condor.py @@ -57,7 +57,7 @@ galaxy_id_tag = job_wrapper.get_id_tag() # get destination params - query_params = submission_params(**job_destination.params) + query_params = submission_params(prefix="", **job_destination.params) galaxy_slots = query_params.get('request_cpus', None) if galaxy_slots: galaxy_slots_statement = 'GALAXY_SLOTS="%s"; export GALAXY_SLOTS_CONFIGURED="1"' % galaxy_slots diff -r 43b42520bd5b89f5b0f281efcbc5513e501326cd -r 28469a503b56c374f8ec4730e276a89a6323cef9 lib/galaxy/jobs/runners/util/condor/__init__.py --- a/lib/galaxy/jobs/runners/util/condor/__init__.py +++ b/lib/galaxy/jobs/runners/util/condor/__init__.py @@ -18,12 +18,12 @@ SUBMIT_PARAM_PREFIX = "submit_" -def submission_params(**kwds): +def submission_params(prefix=SUBMIT_PARAM_PREFIX, **kwds): submission_params = {} for key, value in kwds.iteritems(): key = key.lower() - if key.startswith(SUBMIT_PARAM_PREFIX): - condor_key = key[len(SUBMIT_PARAM_PREFIX):] + if key.startswith(prefix): + condor_key = key[len(prefix):] submission_params[condor_key] = value return submission_params 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.