2:43 a.m.
3 new commits in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/d85bb0b0400c/
Changeset: d85bb0b0400c
Branch: stable
User: dan
Date: 2015-02-24 17:20:34+00:00
Summary: Fix for installing .loc files from the toolshed to respect
shed_tool_data_path. Mention shed_tool_data_path in galaxy.ini.sample.
Affected #: 2 files
diff -r 02ddea42faade21f5a76602d1e4035aa02a0151e -r
d85bb0b0400ca1d3dbd74ef6816fcc9a30c2e83f config/galaxy.ini.sample
--- a/config/galaxy.ini.sample
+++ b/config/galaxy.ini.sample
@@ -206,6 +206,10 @@
# https://wiki.galaxyproject.org/Admin/DataIntegration
#tool_data_path = tool-data
+# Directory where Tool Data Table related files will be placed
+# when installed from a ToolShed. Defaults to tool_data_path
+#shed_tool_data_path = tool-data
+
# File containing old-style genome builds
#builds_file_path = tool-data/shared/ucsc/builds.txt
diff -r 02ddea42faade21f5a76602d1e4035aa02a0151e -r
d85bb0b0400ca1d3dbd74ef6816fcc9a30c2e83f lib/tool_shed/tools/data_table_manager.py
--- a/lib/tool_shed/tools/data_table_manager.py
+++ b/lib/tool_shed/tools/data_table_manager.py
@@ -103,7 +103,7 @@
try:
new_table_elems, message = self.app.tool_data_tables \
.add_new_entries_from_config_file( config_filename=filename,
-
tool_data_path=self.app.config.tool_data_path,
+
tool_data_path=self.app.config.shed_tool_data_path,
shed_tool_data_table_config=self.app.config.shed_tool_data_table_config,
persist=persist )
if message:
https://bitbucket.org/galaxy/galaxy-central/commits/5cdf5dc395f1/
Changeset: 5cdf5dc395f1
Branch: stable
User: dan
Date: 2015-02-25 17:18:53+00:00
Summary: Fix for ToolShed not having config.shed_tool_data_path
Affected #: 1 file
diff -r d85bb0b0400ca1d3dbd74ef6816fcc9a30c2e83f -r
5cdf5dc395f16f47e88a5567775dcd21b4906f08 lib/galaxy/webapps/tool_shed/config.py
--- a/lib/galaxy/webapps/tool_shed/config.py
+++ b/lib/galaxy/webapps/tool_shed/config.py
@@ -139,6 +139,10 @@
self.citation_cache_data_dir = resolve_path( kwargs.get(
"citation_cache_data_dir", "database/tool_shed_citations/data" ),
self.root )
self.citation_cache_lock_dir = resolve_path( kwargs.get(
"citation_cache_lock_dir", "database/tool_shed_citations/locks" ),
self.root )
+ @property
+ def shed_tool_data_path( self ):
+ return self.tool_data_path
+
def __parse_config_file_options( self, kwargs ):
defaults = dict(
datatypes_config_file = [ 'config/datatypes_conf.xml',
'datatypes_conf.xml', 'config/datatypes_conf.xml.sample' ],
https://bitbucket.org/galaxy/galaxy-central/commits/bba783264efc/
Changeset: bba783264efc
Branch: stable
User: natefoo
Date: 2015-03-10 02:43:32+00:00
Summary: Update tag latest_2015.01.13 for changeset 5cdf5dc395f1
Affected #: 1 file
diff -r 5cdf5dc395f16f47e88a5567775dcd21b4906f08 -r
bba783264efcc0bbd0e7b5752509924264ad68e0 .hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -22,4 +22,4 @@
2092948937ac30ef82f71463a235c66d34987088 release_2014.10.06
782fa60fc65488aea0c618d723e9a63d42caf865 latest_2014.10.06
2e8dd2949dd3eee0f56f9a3a5ebf1b2baca24aee release_2015.01.13
-d677cb314dccedd8743eba26f1d446cdf97ebf16 latest_2015.01.13
+5cdf5dc395f16f47e88a5567775dcd21b4906f08 latest_2015.01.13
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving
this because you have the service enabled, addressing the recipient of
this email.