Commit Graph
569 Commits
Author SHA1 Message Date
Nate Coraor e64ab4c85c There's no reliable way to use the Galaxy config file to control egg use/fetching since so many things use galaxy.eggs from outside of Galaxy, so drop the support for the config file options and rely on the environment variables only. Reverse the defaults so that eggs and fetching are enabled by default. I'll make sure that they properly get passed to the tool execution environments in the next commit. 2015-02-12 15:10:19 -05:00
Nate Coraor 1e07117791 Place the new egg config options into the environment at Galaxy startup since
eggs.require() has no access to the config file.
2015-02-12 14:27:37 -05:00
Nate Coraor 92f6ace47f Ensure the correct default Galaxy config file is found in common_startup.sh, it
makes a difference for egg fetching since some eggs are conditional based on
config.
2015-02-12 11:47:58 -05:00
Dannon Baker c733ce370b Fix path insertion vs appending of <galaxy>/lib for all scripts. 2015-02-12 10:34:51 -05:00
Dannon Baker de1cd01954 Fix path manipulation during fetch_eggs. This getting an external version of pkg_resources (and not ours in lib/) is what is causing the weird egg fetching errors. Newer versions of pkg_resources create a mangled distribution string for some eggs with nonstandard version identifiers. 2015-02-12 08:28:37 -05:00
John Chilton 38679a0d32 Dynamically fetch and cache test-data from git repositories if needed...
... for tool tests. Longer term this functionality should be dropped (i.e. after all the tools are out of Galaxy) and the test-data always lives next to the tool - but for now it decreases the size of the repository ahead of a potential move to github.
2015-02-09 21:43:42 -05:00
Dave Bouvier decb4a1ec0 Add script to update the paths to tool config files in installed repositories' metadata. 2015-01-30 12:17:01 -05:00
Dannon Baker dba89dff83 Convert everything from elementtree to stdlib xml module. 2015-01-29 16:10:56 -05:00
Martin Cech 9f454b404f found a known Whoosh bug, trying to avoid it
https://bitbucket.org/mchaput/whoosh/issue/386/keyerror-1l
2015-01-29 11:43:29 -05:00
Nate Coraor 29dda3e11a Remove GeneTrack remnants. 2015-01-28 16:29:21 -05:00
Martin Cech f10ed7d184 way better search; dont query DB; repair final scoring functions 2015-01-28 15:24:10 -05:00
Martin Cech fd8a7da910 adjust schema, start dynamic scoring 2015-01-27 17:15:18 -05:00
Martin Cech 05e9ea637e initial version of TS search API and Index builder script
beware: always returns jsonp for now
2015-01-26 13:08:16 -05:00
Nicola Soranzo ee28d3c45a Fix merge() documentation. 2015-01-23 19:19:15 +00:00
John Chilton 46f2679e9d Tool Tests - Only set library import dir if it exists.
Fixes planemo #41 (https://github.com/galaxyproject/planemo/issues/41).
2015-01-11 21:32:50 -05:00
John Chilton b0e43e567e Allow specification of multiple data manager configuration files...
... use this to create API functional tests for data managers.
2014-12-15 00:20:35 -05:00
John Chilton 33463efe13 Allow multiple tool data table config files...
... use this functionality to implement tests for tool data API.
2014-12-15 00:20:35 -05:00
John Chilton ec24396140 Refactoring: Start abstracting XML processing out of Tool and param classes.
Long term this could allow Galaxy to support - multiple tooling formats (Galaxy-like YAML, CWL http://bit.ly/cwltooldesc, etc...). But I think it is also important from a purely design perspective - this is a core logic class integrating different components - they should not also be doing XML parsing.

To verify the interface for parsing tools is expressive enough to allow multiple useful implementations, I built a test YAML tool description that implements many of the same features as Galaxy but smooths out rough edges (uses exit codes for job failure by default for instance). Loading these tools is disabled by default and it is not documented how to enable them because they are not intended to be part of Galaxy's public API.
2014-12-11 00:26:13 -05:00
John Chilton 887bc44a41 Implement structured tool test data.
Rather than relying solely on exceptions back to nose/test framework - add option (--structured_data_report_file) to run_tests.sh that causes a bunch of detailed data to be dumped to the specified file in a very structured way. Includes full to_dict of the job from the API which in turn includes job metrics, command-line, job's standard error and outputs (instead of the test frameworks), as well as the tool inputs, and exceptions broken out for tool execution versus output checking.

Its all indexed in the file by the test id (without the actual test toolbox depending on knowing the test id) - so one could pair this information with the XUnit output to produce much more detailed breakdowns of the tests.
2014-12-08 00:21:47 -05:00
John Chilton b7ddf97561 Reduce some duplication related to nose running. 2014-12-08 00:21:47 -05:00
John Chilton e9ed914f80 Remove redundant lines in scripts/functional_tests.py.
This stuff is already imported at the top of the file - my guess is the need to import it later is not longer needed.
2014-12-08 00:21:47 -05:00
John Chilton 4194c80669 Drop psu_production stuff from scripts/functional_tests.py.
These tests need to runnable against running servers but should be more general and updated.
2014-12-08 00:21:47 -05:00
Lance Parsons b4c9f2fb10 Added pkg_resources to load required Mako package 2014-12-03 14:50:56 -05:00
Dannon Baker 3910c1f7f3 Merge stable. 2014-10-17 08:07:24 -04:00
John Chilton d475080370 Fix for datatypes consuming output extra files path for the change in d781366.
That change forced $output.extra_files_path to be the same thing as $output.files_path. See rational in changeset.

Some datatypes however consume this path when generated metadata - post d781366 these datatypes would be accessing the wrong directory. This fixes them.

The suggested best practice I would put forward is $input.extra_files_path and $output.files_path. $output.extra_files_path redirects to $output.files_path for newer Galaxy versions (August 2014+) so that Galaxy configurations requiring this directory be in the jobs working directory work. Datatypes consuming dataset.extra_files_path for these outputs will be broken when used with $output.files_path for the August release of Galaxy - but if this changeset is back-ported to the October 2014 release then these types and tools will work going forward (without modification).

It can be verified that the older releases are broken with the following existing test (fixed with this changeset).

./run_functional_tests.sh -framework -id composite_output
2014-10-15 12:57:10 -04:00
John Chilton d540619868 Fix set_metadata.py for environmental set Galaxy properties.
At least for the local job runner. This variant of property loading does correctly interpolate %(here) so there is no longer a need to catch those exceptions and object store related properties can use %(here).
2014-10-14 15:25:55 -04:00
John Chilton f5d1f77a4f Make functional tests to respect GALAXY_CONFIG_ environment variables.
Functional tests don't work without the tweak to imports in cloudlaunch - not sure if that has always been a problem and I am just running the tests in a different Galaxy instance or if the earlier import of util caused the problem.

Regardless I guess we shoud update to a version of bioblend that doesn't require simplejson.
2014-10-06 20:56:58 -04:00
John Chilton 01a9e91f39 Another fix for galaxy.ini being conditionally existent.
Update scripts/check_eggs.py and scripts/fetch_eggs.py with logic to find the correct config file. These files should be refactored so they can share some of this code the way I refactored the database management scripts I guess.
2014-10-03 01:34:42 -04:00
John Chilton aa5111d74d Fix tool migrations to respect GALAXY_CONFIG_* environment variables.
Thanks to Bjoern for the bug report.
2014-09-28 00:37:21 +00:00
John Chilton 8c7c1b64be Fix run_tests.sh --with_framework_test_tools for 9a05d1e.
Now appends test tools to sample tools instead of to default tools Galaxy would other wise load (config/tool_conf.xml or tool_conf.xml if these exist instead of sample) - so this is different behavior but I am unsure if it is worse. --with_framework_test_tools was added for API tests and these should probably target the distribution and not random tools someone might have configured so perhaps this new behavior is superior.
2014-09-23 13:38:25 -04:00
Nate Coraor 41bbe96791 Functional test fix for config file moves. 2014-09-23 10:09:17 -04:00
Nate Coraor d294af4866 Fix scripts that use galaxy.model.orm.scripts' get_config method to find either config/galaxy.ini or universe_wsgi.ini. For the tool_shed database it'll find either config/tool_shed.ini or tool_shed_wsgi.ini. Also re-fix the unit test.
Database and tool migrations won't work if you use galaxy.ini.sample. Perhaps it should automatically try appending .sample? Or we should really be encouraging people to use the config file properly.
2014-09-17 01:33:17 -04:00
Nate Coraor 267e4d9b88 Don't create galaxy.ini, just use the sample if galaxy.ini does not exist. Also fix startup when galaxy.ini.sample. Fixes the universe_wsgi.ini skipping problem Dannon found. 2014-09-15 22:12:18 -04:00
Nate Coraor acd078a65c merge. 2014-09-15 16:57:28 -04:00
Nate Coraor bc5ec4fec4 Bug fixes to scripts for config subdir. 2014-09-15 16:52:50 -04:00
Nate Coraor 8fadc6392b Rename universe_wsgi.ini -> galaxy.ini everywhere. 2014-09-15 16:43:51 -04:00
Nate Coraor f7498a9b92 Remove old messaging code. 2014-09-15 15:53:39 -04:00
Nate Coraor 4306560237 Remove unused "Main" versions of cleanup convenienence wrappers. 2014-09-15 15:34:03 -04:00
Dannon Baker 038f6dc6d5 Switch to_json_string/from_json_string in galaxy/scripts. 2014-09-09 10:04:28 -04:00
Kyle Ellrott 47f0f822f0 Refactoring work to add in Workflow UUIDs 2014-08-20 14:10:43 -07:00
John Chilton 78e0ede829 Fix for running LSF DRMAA jobs as 'real' user.
Fix thanks to Chong Chen at IBM - "When invoking the LSF drmma api to submit a job, the API will print the message like 'Job <78> is submitted to default queue <normal>'. So if the Galaxy want to use this API, need modify the drmaa_external_runner.py script to handle this message.  LSF already support a env variable to disable this message print out, "BSUB_QUIET", set this into env can disable this message output."

A second issue was related to subsequent querying of the job state as a user other than the submitter - according to Chong Chen this has been fixed in latest LSF DRMAA changes on github (https://github.com/PlatformLSF/lsf-drmaa/commit/43e62546172b90d9f95e90273d77f4c35a0bb404).
2014-08-18 08:43:37 -04:00
Nate Coraor 4227d0eabb Remove additional pieces from old genome index system. 2014-07-27 02:48:40 -04:00
Dave Bouvier 35bc12d769 Migrate tools from the distribution to the tool shed. 2014-07-28 11:58:52 -04:00
Daniel Blankenberg b966989a55 1.) Enhance set_metadata scripts to be able to handle metadata declared by tools for both regular declared outputs and new primary output datasets using JSON.
2.) Enhance collect_primary_datasets to allow tools to provide extra_files.
2014-07-10 12:09:50 -04:00
Dave Bouvier 4e63bc8731 Fetch eggs after initializing sample files, per John Chilton's comment. 2014-06-13 17:32:51 -04:00
Dave Bouvier 8b45411adf Abstract common startup tasks into scripts/common_startup.sh, which used to be copy_sample_files.sh. 2014-06-13 16:39:59 -04:00
John Chilton 63a4c36770 Add utility for debugging sqlalchemy queries in db_shell.py.
Should aid in interactively building up queries.
2014-06-10 15:01:38 -05:00
Dave Bouvier 4f2e506042 Enable running the create_users and create_categories scripts via run_tool_shed.sh 2014-05-22 10:59:18 -04:00
Dave Bouvier a3018feb02 Migrate 22 tools from the distribution to the tool shed. 2014-05-19 13:01:46 -04:00
Greg Von Kuster 2d5c37a73f Enhance the galaxy API for the Tool Shed to retrieve the latest installable revision from the Tool Shed from an installed repository, specifying a name and owner. Enhance the ~/scripts/api/install_tool_shed_repositories.py script to allow the changeset_revision to be optional, and if not specified, the latest installable revision will be installed for the repository specified by the name and owner. 2014-05-14 18:13:33 -04:00