Commit Graph
581 Commits
Author SHA1 Message Date
John Chilton 5d31ce641a Fix problem with twill's custom subprocess module.
There has been for some time a scary warning when testing (http://dev.list.galaxyproject.org/run-test-sh-ImportError-cannot-import-name-args-from-interpreter-flags-td4666277.html) that I now understand is the result of Twill being packaged with its own custom subprocess module that conflicts with modules using multiprocessing (e.g. kombu).

After the #198 this scary warning has become an exception that prevents exception of tests (see https://travis-ci.org/galaxyproject/planemo/jobs/61547827 for instance). Importing subprocess seems to force Python to use the system module instead of twills - which seems to prevent these problems.

There have been other reports of this problem with Twill in other projects and removing the subprocess module didn't seem to break anything for them either.
2015-05-06 20:24:50 -04:00
Martin Cech 16ee7fa74c add default config for TS search; rename to match TS playbook 2015-04-21 11:59:01 -04:00
Martin Cech dc736c73f2 remove another abspath; use optparse; 2015-04-14 11:31:44 -04:00
Martin Cech 66e61271b1 add comments and example; add consistency checks; remove bash script 2015-04-14 10:55:34 -04:00
Martin Cech c12b8063e3 remove abspath 2015-04-13 14:39:31 -04:00
Martin Cech a9bc7dc5ca generate separate index for tools in repositories 2015-04-13 13:45:32 -04:00
John Chilton a357e2b613 Workflow scaling test infrastructure.
- Add script to hit the API with workflows requests.
 - Update testing Dockerfile to allow just booting up with a fixed master API key for this test to leverage.
 - WIP: on updating test Dockerfile to work with slurm, multiple handlers, uwsgi, etc...
2015-03-25 14:54:48 -04:00
Carl Eberhard 9a7f5fc17b Remove scripts/packed, packing infrastructure, and pack_scripts config options 2015-03-17 10:31:35 -04:00
Nicola Soranzo b4acf247df Uniform configuration of "From" field of sent emails.
Subsume activation_email in email_from (used also in tool_shed.ini).
Try also getfqdn in PJA.
Default to 'galaxy-no-reply@' instead of 'galaxy-noreply@' in PJA.
2015-03-13 01:07:57 +00:00
Dannon Baker 8c476931f9 Cleanup related to PR#7 and affected files. 2015-03-05 09:47:14 -05:00
Dannon Baker fe226e1a9b Refactoring of set_user_disk_usage and admin controller disk usage to use the same pgcalc 2015-02-25 12:52:47 -05:00
Dannon Baker 9f01d275ef Add all the necessary dependency requires. Note to self: fix the egg dependency resolution bug so we don't have to dot his. 2015-02-14 10:35:42 -05:00
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