opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-31 02:28:09 +08:00
Code Issues Packages Projects Releases Wiki Activity
41,449 Commits 64 Branches 246 Tags
b2cd5ba8d052d22ef29b3725e8d46052a3b5f3a0
Commit Graph
41449 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
mvdbeek b2cd5ba8d0 Add k8s_walltime_limit to job_conf.xml.sample_advanced 2019-07-10 15:27:25 +02:00
mvdbeek 8fb5936f92 Fix kubernetes runner on py3 
instance_id is a string, so this can't be compared to an integer
on python 3. Broken in ac1b25ed4c,
prior to that the comparison was `len(self._galaxy_instance_id) > 0:`
 2019-07-10 13:55:49 +02:00
Kiran Telukunta saraswathi 34bde631f4 * walltime_limit added for the k8s jobs 
* default is also set to the k8s_walltime_limit in job specification
 2019-07-10 12:51:29 +02:00
Marius van den Beek ef9698895a Merge pull request #8319 from nsoranzo/lowercase_boolean_yaml 
Use lowercase true/false in config_schema.yml
 2019-07-10 11:18:19 +02:00
Marius van den Beek db3a1bac1d Merge pull request #8320 from nsoranzo/merge_19.05_20190709 
Merge 19.05 20190709
 2019-07-10 11:15:46 +02:00
Marius van den Beek bc7b48756b Merge pull request #7402 from guerler/activate_toolshed 
Activate api-based Toolshed interface in Admin panel
 2019-07-10 11:06:18 +02:00
guerler 95d69146be Restore tool metadata endpoint for old tool management grid 2019-07-10 08:21:38 +02:00
Nicola Soranzo d0c28f669b Use lowercase true/false in config_schema.yml 
since these are the only allowed values for booleans in YAML 1.2:
https://yaml.org/spec/1.2/spec.html#id2803629

make config-rebuild
 2019-07-09 18:58:51 +01:00
Nicola Soranzo ea32667142 Merge branch 'release_19.05' into dev 2019-07-09 18:43:43 +01:00
Nicola Soranzo 5e785464b4 Remove mimeparse package in lib/ root. (#8307) 
Remove mimeparse package in lib/ root.
 2019-07-09 16:27:31 +01:00
Marius van den Beek c245630a9d Merge pull request #8257 from guerler/fix_search_icons 
Fix and unify search bar handling
 2019-07-09 17:08:38 +02:00
Dannon Baker 3072975897 Drop mimeparse docs 2019-07-09 14:14:37 +01:00
John Chilton 7fa24b191b Remove mimeparse package in lib/ root. 
Was added for trackster in 985f7c63fa for a tracks controller that no longer exists. Cannot find any references to this module.
 2019-07-09 14:13:12 +01:00
Marius van den Beek d22d7beaf4 Merge pull request #8305 from jmchilton/axe_log_tempfile 
Remove log_tempfile.
 2019-07-09 14:42:43 +02:00
guerler 4359029ef9 Remove legacy toolshed activation flag in config 2019-07-09 13:59:46 +02:00
guerler deaa583890 Merge branch 'dev' into activate_toolshed 2019-07-09 13:58:01 +02:00
Marius van den Beek 2691a4470d Merge pull request #8310 from dglaetzer/dev 
Add and run tests for auth package
 2019-07-09 13:07:40 +02:00
Marius van den Beek ef86713754 Merge pull request #8304 from nsoranzo/remove_temp2.txt 
Use temporary file for sniff tests
 2019-07-09 12:55:25 +02:00
Marius van den Beek 64c71ca7e1 Merge pull request #8290 from natefoo/remove-ci-pip-progress-bar 
Don't show the pip progress bar when installing under CI
 2019-07-09 12:17:49 +02:00
Nate Coraor adc496eae3 Disable progress bar when testing package builds in CI 2019-07-09 11:59:44 +02:00
Nate Coraor 079b9f076d Pass $CI in to tox envs 2019-07-09 11:32:04 +02:00
Nate Coraor 97bcd9c46a Merge pull request #8306 from jmchilton/axe_psyco_full 
Remove psyco_full.py - unused as far as I can tell.
 2019-07-09 11:01:09 +02:00
Dannon Baker f5f15e2dfc Drop log_tempfile docs 2019-07-08 20:04:03 -04:00
Dannon Baker ae11aaa5ec Drop psyco_full docs 2019-07-08 16:08:20 -04:00
dglaetzer 2a1dd4b1a6 Update test_auth.py 2019-07-08 17:52:36 +02:00
dglaetzer ec454313ea dummy tests for auth package 2019-07-08 17:28:32 +02:00
Martin Cech 05d77b7514 Merge pull request #8285 from jxtx/tool-menu-styles 
Some work on tool menu styles
 2019-07-08 17:21:52 +02:00
John Chilton c9ef1b6fad Merge pull request #8302 from dglaetzer/dev 
dummy tests for containers package
 2019-07-08 15:41:48 +02:00
John Chilton 18d9c97492 Merge pull request #921 from natefoo/installable 
Make Galaxy (almost) packageable/installable
 2019-07-08 15:11:56 +02:00
John Chilton 1bed6c4931 Remove psyco_full.py - unused as far as I can tell. 
@natefoo didn't object.
 2019-07-08 14:59:52 +02:00
John Chilton 8a327db74d Remove log_tempfile. 
Simplify packaging - @natefoo said I could.
 2019-07-08 14:52:13 +02:00
James Taylor b7da06e1fc Tool menu styles: restore indent and fix tools not in sections. 2019-07-08 14:22:22 +02:00
Nicola Soranzo 8876f165d1 Use temporary file for tests 
Remove `lib/galaxy/datatypes/test/temp2.txt` which was added by
mistake in commit 54d2ca01f8 .
 2019-07-08 12:45:10 +01:00
dglaetzer 4a6ecd0b61 linting 2019-07-08 13:07:56 +02:00
dglaetzer 2a42853bfa add tests 2019-07-08 12:55:43 +02:00
dglaetzer 84fd69faba dummy tests for containers 2019-07-08 12:54:55 +02:00
guerler 8704fc5648 Fix search template in workflow editor 2019-07-08 12:32:48 +02:00
Nate Coraor 058fabc121 Merge branch 'dev' of https://github.com/galaxyproject/galaxy into installable 2019-07-08 12:27:21 +02:00
dglaetzer ce127498a0 Merge remote-tracking branch 'upstream/dev' into dev 2019-07-08 12:26:36 +02:00
guerler 6c8cdff09c Merge branch 'dev' into fix_search_icons 2019-07-08 12:08:54 +02:00
Nate Coraor d187b28951 Stop trying to guess a web port from the config since most configs are not INI anymore anyway. 2019-07-08 11:43:11 +02:00
John Chilton 23241a29d7 Merge pull request #8280 from dglaetzer/dev 
get tests on data package running
 2019-07-08 11:41:36 +02:00
Nate Coraor 906413d07b Rework config locating logic (it was reading the sample again). 2019-07-08 11:28:31 +02:00
Nate Coraor 751503958f Fixes from PR review 2019-07-08 11:28:04 +02:00
John Chilton 83edc1f623 Merge pull request #8293 from jmchilton/packaging_4 
package-ify top-level Python files in lib/galaxy.
 2019-07-08 10:52:02 +02:00
Nate Coraor e75f2b0895 Symlink sample configs back to config/ 2019-07-08 10:20:01 +02:00
Nate Coraor b6358f5333 Move remaining sample configs to lib/galaxy/config/sample 2019-07-08 10:19:11 +02:00
John Chilton 1815a6547a Bring top-level galaxy Python files into galaxy-app. 2019-07-07 19:45:48 +02:00
John Chilton a9f6c0cd1a Refactor config_watchers out of webapps so can be in galaxy-app package. 2019-07-07 19:10:12 +02:00
dglaetzer 068c981a8c Merge remote-tracking branch 'upstream/dev' into dev 2019-07-07 19:02:14 +02:00