1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/59bd7349a128/
Changeset: 59bd7349a128
User: greg
Date: 2014-04-03 16:19:46
Summary: Upon import, handle problematic prior_installation_required attribute incorrectly added (and set to "False") to the <repository> tag when a repository was exported.
Affected #: 1 file
diff -r 6b7678540ee434a7a305cf43d1a663c8f2fde30c -r 59bd7349a128f06de64f6656f553887b09f18ea2 lib/tool_shed/util/commit_util.py
--- a/lib/tool_shed/util/commit_util.py
+++ b/lib/tool_shed/util/commit_util.py
@@ -292,6 +292,12 @@
revised = False
toolshed = elem.get( 'toolshed' )
changeset_revision = elem.get( 'changeset_revision' )
+ # Over a short period of time a bug existed which caused the prior_installation_required attribute
+ # to be set to False and included in the <repository> tag when a repository was exported along with
+ # its dependencies. The following will eliminate this problematic attribute upon import.
+ prior_installation_required = elem.get( 'prior_installation_required' )
+ if prior_installation_required is not None and not asbool( prior_installation_required ):
+ del elem.attrib[ 'prior_installation_required' ]
sub_elems = [ child_elem for child_elem in list( elem ) ]
if len( sub_elems ) > 0:
# At this point, a <repository> tag will point only to a package.
@@ -310,7 +316,8 @@
# Set to None.
sub_elements = None
if unpopulate:
- # We're exporting the repository, so eliminate all toolshed and changeset_revision attributes from the <repository> tag.
+ # We're exporting the repository, so eliminate all toolshed and changeset_revision attributes from the
+ # <repository> tag.
if toolshed or changeset_revision:
attributes = odict()
attributes[ 'name' ] = name
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.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/6b7678540ee4/
Changeset: 6b7678540ee4
User: davebgx
Date: 2014-04-03 15:45:51
Summary: Use correct revisions of best_regression_subsets and weightedaverage.
Affected #: 1 file
diff -r 773578e65580e3488fadc144739d82f86d9b30f3 -r 6b7678540ee434a7a305cf43d1a663c8f2fde30c scripts/migrate_tools/0010_tools.xml
--- a/scripts/migrate_tools/0010_tools.xml
+++ b/scripts/migrate_tools/0010_tools.xml
@@ -6,7 +6,7 @@
<repository owner="devteam" name="basecoverage" changeset_revision="1e6a9e97fa41" description="Base Coverage of all intervals"><tool id="gops_basecoverage_1" version="0.0.1" file="new_operations/basecoverage.xml" /></repository>
- <repository owner="devteam" name="best_regression_subsets" changeset_revision="54c7a01a2cc7" description="Perform Best-subsets Regression">
+ <repository owner="devteam" name="best_regression_subsets" changeset_revision="e769cde223a5" description="Perform Best-subsets Regression"><tool id="BestSubsetsRegression1" version="0.0.1" file="regVariation/best_regression_subsets.xml" /></repository><repository owner="devteam" name="cluster" changeset_revision="d5677eecbad4" description="Cluster">
@@ -132,7 +132,7 @@
<repository owner="devteam" name="variants_validate" changeset_revision="7e1ecaa64370" description="Validate Variants"><tool id="gatk_validate_variants" version="0.0.4" file="gatk/variants_validate.xml" /></repository>
- <repository owner="devteam" name="weightedaverage" changeset_revision="9b7b4009f2c0" description="Assign weighted-average of the values of features overlapping an interval">
+ <repository owner="devteam" name="weightedaverage" changeset_revision="90611e86a998" description="Assign weighted-average of the values of features overlapping an interval"><tool id="wtavg" version="1.0.0" file="regVariation/WeightedAverage.xml" /></repository><repository owner="devteam" name="windowsplitter" changeset_revision="e5490ea33640" description="Make windows">
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.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/1344876d770a/
Changeset: 1344876d770a
User: davebgx
Date: 2014-04-02 22:05:57
Summary: Corrected an error in the analyze_covariates tool shed repository.
Affected #: 1 file
diff -r e7b2e3c626322294668c5aab56c830d5a2eb5139 -r 1344876d770a4441864bc58e33e50eba860ef7b3 scripts/migrate_tools/0010_tools.xml
--- a/scripts/migrate_tools/0010_tools.xml
+++ b/scripts/migrate_tools/0010_tools.xml
@@ -1,6 +1,6 @@
<?xml version="1.0"?><toolshed name="toolshed.g2.bx.psu.edu">
- <repository owner="devteam" name="analyze_covariates" changeset_revision="be6bede22459" description="Analyze Covariates">
+ <repository owner="devteam" name="analyze_covariates" changeset_revision="738bc749f9a3" description="Analyze Covariates"><tool id="gatk_analyze_covariates" version="0.0.5" file="gatk/analyze_covariates.xml" /></repository><repository owner="devteam" name="basecoverage" changeset_revision="1e6a9e97fa41" description="Base Coverage of all intervals">
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.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/55c0a99ff035/
Changeset: 55c0a99ff035
User: dan
Date: 2014-04-02 21:15:00
Summary: When a tool dependency has failed to install, display the error message as pretty escaped html.
Affected #: 1 file
diff -r 36410a555b2a9e587f4f24ea4ddfc120fde76fd5 -r 55c0a99ff035b9d11adef3a931312c64bb99a45b templates/admin/tool_shed_repository/manage_repository_tool_dependencies.mako
--- a/templates/admin/tool_shed_repository/manage_repository_tool_dependencies.mako
+++ b/templates/admin/tool_shed_repository/manage_repository_tool_dependencies.mako
@@ -31,7 +31,8 @@
%for tool_dependency in repository.tool_dependencies:
<%
if tool_dependency.error_message:
- error_message = tool_dependency.error_message
+ from tool_shed.util.shed_util_common import to_html_string
+ error_message = to_html_string( tool_dependency.error_message )
else:
error_message = ''
if not can_install:
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.