1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/0f70f0b46167/
Changeset: 0f70f0b46167
User: greg
Date: 2013-12-22 01:07:38
Summary: Fix imports in the tool shed install and test framework.
Affected #: 3 files
diff -r 85098aa5c52a2cc66ac590357a52af73545c093e -r 0f70f0b461678cd8224861857055f3eaf7646b05 lib/tool_shed/scripts/check_repositories_for_functional_tests.py
--- a/lib/tool_shed/scripts/check_repositories_for_functional_tests.py
+++ b/lib/tool_shed/scripts/check_repositories_for_functional_tests.py
@@ -14,7 +14,6 @@
import ConfigParser
import galaxy.webapps.tool_shed.config as tool_shed_config
-import galaxy.webapps.tool_shed.model.mapping
import tool_shed.util.shed_util_common as suc
import logging
import shutil
diff -r 85098aa5c52a2cc66ac590357a52af73545c093e -r 0f70f0b461678cd8224861857055f3eaf7646b05 lib/tool_shed/scripts/check_tool_dependency_definition_repositories.py
--- a/lib/tool_shed/scripts/check_tool_dependency_definition_repositories.py
+++ b/lib/tool_shed/scripts/check_tool_dependency_definition_repositories.py
@@ -23,7 +23,6 @@
from mercurial import __version__
import galaxy.webapps.tool_shed.config as tool_shed_config
-import galaxy.webapps.tool_shed.model.mapping
from install_and_test_tool_shed_repositories.base.util import get_database_version
from install_and_test_tool_shed_repositories.base.util import get_repository_current_revision
diff -r 85098aa5c52a2cc66ac590357a52af73545c093e -r 0f70f0b461678cd8224861857055f3eaf7646b05 test/install_and_test_tool_shed_repositories/base/util.py
--- a/test/install_and_test_tool_shed_repositories/base/util.py
+++ b/test/install_and_test_tool_shed_repositories/base/util.py
@@ -30,6 +30,8 @@
from galaxy.util import listify
from galaxy.util import unicodify
from galaxy.util.json import from_json_string
+import galaxy.webapps.tool_shed.model.mapping
+
from nose.plugins import Plugin
from tool_shed.util import tool_dependency_util
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/38b88dceb82e/
Changeset: 38b88dceb82e
User: martenson
Date: 2013-12-21 00:53:41
Summary: docs
Affected #: 2 files
diff -r 11c30107da4eba80c0e76613d1da223f2af8ffe8 -r 38b88dceb82e092f79c2f4b6aff745d11f77dac4 lib/galaxy/webapps/galaxy/api/histories.py
--- a/lib/galaxy/webapps/galaxy/api/histories.py
+++ b/lib/galaxy/webapps/galaxy/api/histories.py
@@ -64,7 +64,6 @@
@web.expose_api_anonymous
def show( self, trans, id, deleted='False', **kwd ):
- # oh, sphinx - you bastard
"""
show( trans, id, deleted='False' )
* GET /api/histories/{id}:
diff -r 11c30107da4eba80c0e76613d1da223f2af8ffe8 -r 38b88dceb82e092f79c2f4b6aff745d11f77dac4 lib/galaxy/webapps/galaxy/api/lda_datasets.py
--- a/lib/galaxy/webapps/galaxy/api/lda_datasets.py
+++ b/lib/galaxy/webapps/galaxy/api/lda_datasets.py
@@ -30,15 +30,14 @@
"""
show( self, trans, id, **kwd )
* GET /api/libraries/datasets/{encoded_dataset_id}:
- Displays information about the dataset identified by the encoded id.
+ Displays information about the dataset identified by the encoded ID.
-
+ :param id: the encoded id of the dataset to query
:type id: an encoded id string
- :param id: the encoded id of the dataset to query
:rtype: dictionary
- :returns: detailed dataset information from
- :func:`galaxy.web.base.controller.UsesVisualizationMixin.get_library_dataset.to_dict()`
+ :returns: detailed dataset information from base controller
+ .. seealso:: :attr:`galaxy.web.base.controller.UsesLibraryMixinItems.get_library_dataset`
"""
# Get dataset.
try:
@@ -66,18 +65,16 @@
"""
download( self, trans, format, **kwd )
* GET /api/libraries/datasets/download/{format}
+ Downloads requested datasets (identified by encoded IDs) in requested format.
- .. code-block::
- example:
- GET localhost:8080/api/libraries/datasets/download/tbz?ldda_ids%255B%255D=a0d84b45643a2678&ldda_ids%255B%255D=fe38c84dcd46c828
+ example: ``GET localhost:8080/api/libraries/datasets/download/tbz?ldda_ids%255B%255D=a0d84b45643a2678&ldda_ids%255B%255D=fe38c84dcd46c828``
+ .. note:: supported format values are: 'zip', 'tgz', 'tbz', 'uncompressed'
+
+ :param format: string representing requested archive format
:type format: string
- :param format: string representing requested archive format
-
- .. note:: supported formats are: zip, tgz, tbz, uncompressed
-
+ :param lddas[]: an array of encoded ids
:type lddas[]: an array
- :param lddas[]: an array of encoded ids
:rtype: file
:returns: either archive with the requested datasets packed inside or a single uncompressed dataset
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/11c30107da4e/
Changeset: 11c30107da4e
User: inithello
Date: 2013-12-20 18:55:49
Summary: Fix for removing generated test definitions from the global scope after a repository has been tested.
Affected #: 1 file
diff -r 68c080722bc7f6accf73325bdf049eb84125da27 -r 11c30107da4eba80c0e76613d1da223f2af8ffe8 test/install_and_test_tool_shed_repositories/repositories_with_tools/functional_tests.py
--- a/test/install_and_test_tool_shed_repositories/repositories_with_tools/functional_tests.py
+++ b/test/install_and_test_tool_shed_repositories/repositories_with_tools/functional_tests.py
@@ -254,8 +254,6 @@
file( galaxy_shed_tools_dict, 'w' ).write( to_json_string( shed_tools_dict ) )
log.debug( 'Saved generated shed_tools_dict to %s\nContents: %s' % ( str( galaxy_shed_tools_dict ),
str( shed_tools_dict ) ) )
- # Remove twills' old generated test before building the new tests for the current tools.
- remove_tests( app )
try:
install_and_test_statistics_dict = test_repository_tools( app,
repository,
@@ -570,6 +568,14 @@
"""
tests_to_delete = []
tools_to_delete_by_id = []
+
+ # Push all the toolbox tests to module level
+ G = globals()
+
+ # Eliminate all previous tests from G.
+ for key, val in G.items():
+ if key.startswith( 'TestForTool_' ):
+ del G[ key ]
global test_toolbox
# Find all tests previously generated by twill.
for key in test_toolbox.__dict__:
@@ -590,17 +596,6 @@
if tool_id in app.toolbox.tools_by_id:
log.debug( 'Deleting tool id %s from app.toolbox[ tools_by_id ].' % str( tool_id ) )
del app.toolbox.tools_by_id[ tool_id ]
- # Push all the toolbox tests to module level
- for key in test_install_repositories.__dict__:
- if key.startswith( 'TestInstallRepository_' ):
- log.debug( 'Repository installation process test %s discovered.' % str( key ) )
- # We can't delete this test just yet, we're still iterating over __dict__.
- tests_to_delete.append( key )
- # Delete the discovered twill-generated tests.
- for key in tests_to_delete:
- if key in test_install_repositories.__dict__:
- log.debug( 'Deleting test %s from test_toolbox.' % str( key ) )
- del test_install_repositories.__dict__[ key ]
def test_repository_tools( app, repository, repository_dict, tool_test_results_dicts, tool_test_results_dict,
install_and_test_statistics_dict ):
@@ -674,6 +669,8 @@
can_update_tool_shed )
log.debug( 'Revision %s of repository %s owned by %s installed successfully but did not pass functional tests.' % \
( changeset_revision, name, owner ) )
+ # Remove twills' old generated test before building the new tests for the current tools.
+ remove_tests( app )
return install_and_test_statistics_dict
if __name__ == "__main__":
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.
2 new commits in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/2c62316e9a5b/
Changeset: 2c62316e9a5b
User: inithello
Date: 2013-12-20 18:22:01
Summary: Order repository revisions by ID, descending.
Affected #: 1 file
diff -r c125d7050c3b5a34305c377cd31b3a77be753d99 -r 2c62316e9a5bd985b264e7bf7d10eadc1b74cde8 lib/galaxy/webapps/tool_shed/api/repository_revisions.py
--- a/lib/galaxy/webapps/tool_shed/api/repository_revisions.py
+++ b/lib/galaxy/webapps/tool_shed/api/repository_revisions.py
@@ -155,7 +155,7 @@
try:
query = trans.sa_session.query( trans.app.model.RepositoryMetadata ) \
.filter( and_( *clause_list ) ) \
- .order_by( trans.app.model.RepositoryMetadata.table.c.repository_id ) \
+ .order_by( trans.app.model.RepositoryMetadata.table.c.repository_id.desc() ) \
.all()
for repository_metadata in query:
repository_metadata_dict = repository_metadata.to_dict( view='collection',
https://bitbucket.org/galaxy/galaxy-central/commits/68c080722bc7/
Changeset: 68c080722bc7
User: inithello
Date: 2013-12-20 18:22:24
Summary: Fix for error message when resetting metadata on an installed repository.
Affected #: 1 file
diff -r 2c62316e9a5bd985b264e7bf7d10eadc1b74cde8 -r 68c080722bc7f6accf73325bdf049eb84125da27 lib/tool_shed/util/tool_util.py
--- a/lib/tool_shed/util/tool_util.py
+++ b/lib/tool_shed/util/tool_util.py
@@ -247,12 +247,16 @@
bold_start = ''
bold_end = ''
message = ''
+ if trans.webapp.name == 'galaxy':
+ tip_rev = str( repository.changeset_revision )
+ else:
+ tip_rev = str( repository.tip( trans.app ) )
if not displaying_invalid_tool:
if metadata_dict:
- message += "Metadata may have been defined for some items in revision '%s'. " % str( repository.tip( trans.app ) )
+ message += "Metadata may have been defined for some items in revision '%s'. " % tip_rev
message += "Correct the following problems if necessary and reset metadata.%s" % new_line
else:
- message += "Metadata cannot be defined for revision '%s' so this revision cannot be automatically " % str( repository.tip( trans.app ) )
+ message += "Metadata cannot be defined for revision '%s' so this revision cannot be automatically " % tip_rev
message += "installed into a local Galaxy instance. Correct the following problems and reset metadata.%s" % new_line
for itc_tup in invalid_file_tups:
tool_file, exception_msg = itc_tup
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.