opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity
53,343 Commits 69 Branches 243 Tags
35c35faa436ccd7b952292dfee46739dc559bb24
Commit Graph
53343 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Dannon Baker 35c35faa43 Fix sqlalchemy column handling -- this is so unintuitive :/ 2021-05-11 21:09:52 -04:00
Dannon Baker e7d48d8f9a Fix old (minor) typo 2021-05-11 21:02:39 -04:00
Dannon Baker c2b2d52c4c Another pass post-rebase 2021-05-11 13:56:10 -04:00
Dannon Baker ace65206e2 fstring fixup 2021-05-11 13:53:23 -04:00
Dannon Baker 64025b767b Typo fix 2021-05-11 13:53:23 -04:00
Dannon Baker f1ff658cb7 Concatenation pass, fstring conversion 2021-05-11 13:53:20 -04:00
Dannon Baker 22e7601653 First pass fstring conversion 2021-05-11 13:47:00 -04:00
mvdbeek e5d7b13d44 Merge branch 'release_21.05' into dev 2021-05-11 18:29:09 +02:00
mvdbeek 191a4b848e Merge branch 'release_21.01' into release_21.05 2021-05-11 18:28:04 +02:00
mvdbeek 2552ab47f1 Use f-strings in forward-merged code 2021-05-11 18:09:53 +02:00
mvdbeek 41aca51d2b Merge branch 'release_20.09' into release_21.01 2021-05-11 18:01:46 +02:00
Marius van den Beek f963b67a6e Merge pull request #11955 from mvdbeek/fix_ipv6_port_parsing 
[20.09] Fix container port parsing if IPv6 hostname is ``::``
 2021-05-11 17:59:47 +02:00
mvdbeek 01cdbd3ebd Fix port_parse rsplit usage 2021-05-11 16:40:57 +02:00
Marius van den BeekandNicola Soranzo 8acf0d16a8 Use different string formatting option 
Co-authored-by: Nicola Soranzo <nicola.soranzo@gmail.com>
 2021-05-11 14:57:21 +02:00
Marius van den BeekandNicola Soranzo d69a79f29e Use generator expression instead of list comprehension 
Co-authored-by: Nicola Soranzo <nicola.soranzo@gmail.com>
 2021-05-11 14:56:50 +02:00
Marius van den BeekandNicola Soranzo 4db3af8e5d Open container_monitor_exception.txt in write mode 
Co-authored-by: Nicola Soranzo <nicola.soranzo@gmail.com>
 2021-05-11 14:54:56 +02:00
Marius van den BeekandNicola Soranzo 7b9d2dbeb9 Skip :: hostname only 
Co-authored-by: Nicola Soranzo <nicola.soranzo@gmail.com>
 2021-05-11 14:54:28 +02:00
mvdbeek 75f5877951 Log exceptions IT port monitor fails and stop job 
That should make it significantly easier to debug issues when the
container monitor dies unexpectedly (which I sort of expect in the
future given that we parse output from the docker CLI).
 2021-05-10 17:43:46 +02:00
mvdbeek a1ececdcf8 Fix contianer port parsing if ::: in port line 
:: is an unspecified ipv6 address and just recently appeared in the
docker port output.
 2021-05-10 17:37:29 +02:00
John Chilton 34682f3e65 Merge pull request #11949 from bgruening/file_source_examples 
add more examples for the file source plugins
 2021-05-10 09:49:33 -04:00
John Chilton 5c17d7ce57 Merge pull request #11953 from mvdbeek/include_more_info_on_staging_exception 
[21.05] Include more info on test input staging exception
 2021-05-10 09:41:50 -04:00
Nicola Soranzo 306e774a86 Merge pull request #11951 from mvdbeek/fix_anonymous_user_job_walltime_query 2021-05-10 10:57:10 +01:00
mvdbeek c19a98b8e3 Include tool_id, exit_code and stderr in Exception 
That'll be useful to figure out what's going on when data staging fails.
 2021-05-07 21:44:25 +02:00
Marius van den Beek 897fde2171 Merge pull request #11950 from mvdbeek/revert_attach_to_pool_default 
[21.05] Don't let webless handlers join job-handlers pool automatically
 2021-05-07 14:39:50 +02:00
mvdbeek bdc366c64f Fix pause message when over walltime 2021-05-07 13:20:59 +02:00
Maiken Pedersen 958e52642b Fix job query filter in walltime check 2021-05-07 13:19:29 +02:00
mvdbeek bb3e9bffab Don't set default pool 2021-05-07 11:17:02 +02:00
Björn Grüning 4af386ba04 add minio example back 2021-05-07 11:06:56 +02:00
Bjoern Gruening 3fcf3c5120 add more examples for the file source plugins 2021-05-07 09:41:15 +02:00
Marius van den Beek 22b3a17853 Merge pull request #11946 from natefoo/fix-release-macos-sed 
[21.05] Fix usage of sed -i on macOS in release script
 2021-05-06 18:11:55 +02:00
Nate Coraor 9ee437d57f Fix usage of sed -i on macOS in release script 2021-05-06 11:27:48 -04:00
Nicola Soranzo fc019de803 Merge branch 'release_21.05' into dev 2021-05-06 12:51:14 +01:00
Nicola Soranzo 99da99becf Merge branch 'release_21.05' into dev 2021-05-06 12:50:20 +01:00
Nicola Soranzo 5bdfc93936 Merge branch 'release_21.01' into release_21.05 2021-05-06 12:49:35 +01:00
Marius van den Beek 2ea1b94e39 Merge pull request #11945 from nsoranzo/release_21.01_fix_mypy 
[21.01] Backport #11900
 2021-05-06 13:33:04 +02:00
John Chilton 75e93a5d43 Fix package CI. 2021-05-06 12:20:53 +01:00
Nicola Soranzo 65ea55bb02 Merge branch 'release_21.01' into release_21.05 2021-05-06 11:45:26 +01:00
Nicola Soranzo fa58f37f28 Merge branch 'release_20.09' into release_21.01 2021-05-06 11:39:48 +01:00
Dannon 722ee3dfcb Merge pull request #11937 from mvdbeek/version-21.09.dev 
Update version to 21.09.dev0
 2021-05-05 15:58:30 -04:00
Dannon bc985778f6 Merge pull request #11936 from mvdbeek/version-21.05.rc1 
Update version to 21.05.rc1
 2021-05-05 15:58:05 -04:00
mvdbeek 07fb59937e Update version to 21.09.dev0 2021-05-05 21:48:01 +02:00
mvdbeek 40795140d9 Update version to 21.05.rc1 2021-05-05 21:30:54 +02:00
Marius van den Beek b34abec9a6 Merge pull request #11383 from almahmoud/k8s_runner_its 
[21.05] ITs on Kubernetes
 2021-05-05 21:08:05 +02:00
mvdbeek b4e24ea69b Merge branch 'k8s_runner_its' of https://github.com/almahmoud/galaxy into k8s_runner_its 2021-05-05 20:47:08 +02:00
mvdbeek b7f1b7d81c Fix package tests 2021-05-05 20:44:09 +02:00
almahmoud 5448124118 Back to old apiversion 2021-05-05 14:23:12 -04:00
Alexandru MahmoudandMarius van den Beek 1e8a8d1337 Apply suggestions from code review 
Co-authored-by: Marius van den Beek <m.vandenbeek@gmail.com>
 2021-05-05 13:09:50 -04:00
almahmoud ed362c48b9 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into alex_branch 2021-05-05 12:47:09 -04:00
John Chilton 51243f185c Merge pull request #11934 from nsoranzo/fix_test_history_contents 
Don't move the `update_time` goalpost
 2021-05-05 11:31:45 -04:00
Dannon 89bd183898 Merge pull request #11933 from nsoranzo/datasets_api_doc_fix 
Fix `GET /api/datasets/` docs
 2021-05-05 10:13:47 -04:00