Commit Graph
23 Commits
Author SHA1 Message Date
Nicola Soranzo 6569c2dcc3 Partially lint scripts/ . 2015-07-13 20:13:28 +01:00
Dannon Baker 8c476931f9 Cleanup related to PR#7 and affected files. 2015-03-05 09:47:14 -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
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
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
Dannon Baker 559ecb4ec8 Remove dependency on simplejson; convert everything over to using the json module in the python standard library. 2014-01-10 07:29:05 -05:00
John Chilton 82787696ef PEP-8 fixes for set_metadata.py. 2014-01-02 17:50:14 -06:00
Dannon Baker ae36520d56 Metadata setting: Always set externally. 2013-05-06 12:50:06 -04:00
Daniel Blankenberg e316254e28 Change indent from 3 spaces to 4 for 8171:4b62ed46e5b6. 2012-11-07 10:45:10 -05:00
Daniel Blankenberg bbeed4dc0b Use check_python() to verify python version in set_metadata.py instead of hardcoded minimum version check. 2012-11-07 10:35:56 -05:00
Nate Coraor c43633c5cb Pass the config file name to set_metadata.py rather than relying on a hardcoded value. 2012-02-08 11:12:10 -05:00
Nate Coraor d95e50dabd Merge galaxy-central. 2011-12-07 16:06:24 -05:00
Greg Von Kuster 17c5b27cdc Re-engineer the datatypes registry so that it is initialized once when the Galaxy server is started, but data types can continue to be loaded throughout the Galaxy server's session (hopefully this doesn't break anything).
Add support for a single "import_module" to be passed to the new load_datatypes() method in the datatypes registry.  This provides the ability to load a single class module from an installed tool shed repository along with a datatypes_conf.xml file included in the installed repository and pass them to the new load_datatypes() method.  In the future, multiple imported modules may be allowed.  The datatypes_conf.xml file included in the repository must conform to a slightly different definition than the same named file that comes with the distribution.  This new definition will be documented in the Galaxy tool shed wiki.

We now have the ability to load new data types into the Galaxy server from an installed tool shed repository without restarting the Galaxy server.
2011-11-23 16:16:15 -05:00
Enis Afgan 29253409ac Metadata is now being handled by the ObjectStore as well 2011-08-01 17:35:26 -04:00
Daniel Blankenberg 77bd226f2b When setting metadata externally, substitute a MetadataTempFile object for all populated metadata FileParameters. Fixes the problem with writting to metadata FileParameter files on cluster nodes with read-only database/files directory. 2009-11-30 14:55:30 -05:00
Nate Coraor 8ad4e0eb95 PBS Upload Tool w/ set_metadata_externally = True fixes 2009-11-13 16:50:56 -05:00
Daniel Blankenberg 3fdac6ca6b Fix error message displayed when setting metadata_externally.
e.g:
Exception exceptions.TypeError: TypeError('<galaxy.datatypes.metadata.MetadataTempFile object at 0x40d9a10> is not JSON serializable',) in <bound method MutableAttrInstanceState._cleanup of <sqlalchemy.orm.state.MutableAttrInstanceState object at 0x40d99d0>> ignored
2009-11-09 15:33:38 -05:00
Daniel Blankenberg 460fd53bb7 Provide datatypes registry location when setting metadata externally. 2009-08-03 15:45:26 -04:00
Daniel Blankenberg 34a4a1f4d5 Fix for setting metadata externally when outputs_to_working_directory = True. 2009-03-06 12:32:31 -05:00
Daniel Blankenberg 50e385d4a5 Use JSON instead of pickle for setting metadata externally, except for DatasetInstance objects. 2009-03-05 12:53:57 -05:00
Daniel Blankenberg df82f3e163 Add the ability for metadata to be set in an external process, this requires set_metadata_externally = True in universe_wsgi.ini.
Currently this is supported in the local runner (long running set_meta() can now be canceled the same as with jobs) and in the non-staging PBS runner.

There is a slight change to how new Metadata FileParameters are to be created in datatype.set_meta(), see the MAF datatype.

TODO:
Prevent editing of metadata on a running job when metadata is to be set externally.
Have datasets which were copied before job completion use the metadata from the original output dataset; currently .set_meta() is called locally on these.
2009-03-03 12:54:06 -05:00