Commit Graph
543 Commits
Author SHA1 Message Date
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 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
John Chilton 3287af315d Ensure new_file_path exists before set_metadata.py generates metadata.
This directory is required to exist but usually unneeded because Galaxy creates this directory on startup. However, when setting metadata remotely with the LWR that remote Galaxy instance may have never been started and this directory may not exist.
2014-05-13 09:29:41 -05:00
Greg Von Kuster d818047609 Change the name of the current InstallManager to the more appropriate ToolMigrationManager since it handles only tool migrations. This allows for the InstallManager to be used for more general Tool Shed install processes. 2014-05-06 10:34:28 -04:00
John Chilton 3ac17e09f1 Rework test framework testing and tools.
-framework will still cause just a small set of non-default, non-user facing tools to be tested and exerise various aspects of the tool and test frameworks, but now an argument can be passed in -with_framework_test_tools to allow these tools to be used as part of the normal test framework (i.e. when not using -framework). This serves two purposes - to ensure the feature coverage of existing tests remains high as the tests are migrated out of the distribution and to allow a set of tests to be available for functional (e.g. API tests) that users don't need to see.
2014-04-28 11:48:51 -05:00
Dave Bouvier 5bdb75aa82 Correct usage of "it's" versus "its". 2014-04-17 15:49:32 -04:00
Dave Bouvier 72ce2889cb Merge in fix from next-stable. 2014-04-14 13:18:47 -04:00
Dave Bouvier 7007f8594c Fixed tool help image for gops complement. 2014-04-14 13:17:12 -04:00
Dave Bouvier 979f159915 Merge fix from next-stable. 2014-04-14 09:35:00 -04:00
Dave Bouvier c7e6181c20 Fix issues with tool migration stage 10. 2014-04-14 09:32:41 -04:00
Nicola Soranzo 46641daaa7 Merge galaxy/galaxy-central default branch. 2014-04-11 12:00:39 +02:00
Nicola Soranzo f73d5fba6c Fix old wiki links. 2014-04-10 20:00:45 +02:00
Dave Bouvier 7da3f0a6aa Corrected version for migrated tools. 2014-04-10 13:59:40 -04:00
Dave Bouvier db12448003 Fixed JAVA_JAR_PATH for realigner_target_creator. 2014-04-04 10:37:52 -04:00
Dave Bouvier 463b50bb1d Use correct revisions of best_regression_subsets and weightedaverage. 2014-04-03 09:45:51 -04:00
Dave Bouvier b6af887925 Corrected an error in the analyze_covariates tool shed repository. 2014-04-02 16:05:57 -04:00
Dave Bouvier 83af05b1f2 Migrate 46 tools from the distribution to the tool shed: gatk, gops, regional variation. 2014-04-01 11:04:32 -04:00
Kyle Ellrott e4f45e04e3 Adding script to generate UUIDs for datasets where the value is null. This is to backfill previously generated records (from now on UUID will be generated during creation) 2014-03-04 15:46:10 -08:00
Dave Bouvier 85add8fc6d Fix path for bowtie2. 2014-02-20 23:01:05 +00:00
Dave Bouvier 665099efa4 Situations where a migration warning would be incorrectly displayed, and tools with matching filenames would be removed from the tool_conf.xml after running a migration script. 2014-02-19 15:23:45 -05:00
Dannon Baker 7474579310 Swap amqplib for amqp. This was mostly a drop-in replacement, since it's a currently-maintained fork of amqplib, with slight updates to work with amqp 0-9-1. 2014-02-19 14:27:10 -05:00
Daniel Blankenberg 0c945b7c3b Add a script to check toolshed dependency files for broken/invalid download URLs. 2014-02-17 12:51:34 -05:00
Daniel Blankenberg ea193ce2e6 Add a very simple example script that uses API to run data managers. 2014-02-10 11:59:58 -05:00
John Chilton 17e935528d Add example tool with task splitting to tool functional framework tests.
Enable task splitting in functional tests to test this. Specify tool_dir in samples tool_conf.xml so it doesn't need to be explicitly set in scripts/functional_tests.py.
2014-01-28 14:34:26 -06:00
Dave Bouvier 3ec4601e8d Fix description for find_diag_hits. 2014-01-27 10:44:24 -05:00
Dave Bouvier 448d9f55eb Migrate 43 tools from the distribution to the tool shed. 2014-01-27 09:53:14 -05:00
Dave Bouvier d1114a1b0f Fix deletion of test methods after tests have been run. 2014-01-16 11:30:25 -05:00
Dannon Baker e26d6e56c7 Tweaks to scripts/api/common.py to fix JSONDecodeError removal and clean up code. 2014-01-15 09:05:38 -05:00