Branch: refs/heads/dev Home: https://github.com/galaxyproject/galaxy Commit: 54e89ae4983490da43ab3a1035e2df7f73e11d09 https://github.com/galaxyproject/galaxy/commit/54e89ae4983490da43ab3a1035e2d... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2018-04-30 (Mon, 30 Apr 2018) Changed paths: M lib/galaxy/jobs/runners/util/cli/job/slurm.py M lib/galaxy/jobs/runners/util/cli/job/torque.py Log Message: ----------- Fix broken imports `from galaxy.util import enum` probably never worked. Commit: 65cb42d8d8b45d2d4bc879864bc929fa123a3c16 https://github.com/galaxyproject/galaxy/commit/65cb42d8d8b45d2d4bc879864bc92... Author: Marius van den Beek <m.vandenbeek@gmail.com> Date: 2018-04-30 (Mon, 30 Apr 2018) Changed paths: M lib/galaxy/jobs/runners/util/cli/job/torque.py Log Message: ----------- Fix PBS status reporting Without this commit only very short jobs completed successfully, because the status was always set to complete. This was because the status returned by qstat contains leading spaces before the `job_state = Q` part, so I'm adding a `.strip()`. Imported from https://github.com/galaxyproject/pulsar/commit/9acc5637780e553c3a9d0efb9cf73... Commit: d659058385c3ed52ed4cef43dd277f9917440753 https://github.com/galaxyproject/galaxy/commit/d659058385c3ed52ed4cef43dd277... Author: Nicola Soranzo <nicola.soranzo@earlham.ac.uk> Date: 2018-04-30 (Mon, 30 Apr 2018) Changed paths: M lib/galaxy/tools/parameters/basic.py Log Message: ----------- Simplify imports Commit: 0fac69bd59256391d2e99200e4c2915d1e14ff3f https://github.com/galaxyproject/galaxy/commit/0fac69bd59256391d2e99200e4c29... Author: John Chilton <jmchilton@gmail.com> Date: 2018-05-01 (Tue, 01 May 2018) Changed paths: M lib/galaxy/jobs/runners/util/cli/job/slurm.py M lib/galaxy/jobs/runners/util/cli/job/torque.py M lib/galaxy/tools/parameters/basic.py Log Message: ----------- Merge pull request #6014 from nsoranzo/fix_imports Fix some imports Compare: https://github.com/galaxyproject/galaxy/compare/740e1fc05c78...0fac69bd5925