3 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/9c5a2c5f560d/ Changeset: 9c5a2c5f560d User: inithello Date: 2013-12-11 18:43:36 Summary: When creating a repository, make sure there are no repositories with the same name, deleted or active. Affected #: 2 files diff -r 7e45d419c54da8122f7b5d8e0ace3641e450a727 -r 9c5a2c5f560dbd769b44d684f657625563d52022 lib/galaxy/webapps/tool_shed/controllers/repository.py --- a/lib/galaxy/webapps/tool_shed/controllers/repository.py +++ b/lib/galaxy/webapps/tool_shed/controllers/repository.py @@ -932,7 +932,7 @@ repository_type = kwd.get( 'repository_type', rt_util.UNRESTRICTED ) if kwd.get( 'create_repository_button', False ): error = False - message = repository_maintenance_util.validate_repository_name( name, trans.user ) + message = repository_maintenance_util.validate_repository_name( trans.app, name, trans.user ) if message: error = True if not description: @@ -2085,7 +2085,7 @@ repository.long_description = long_description flush_needed = True if repository.times_downloaded == 0 and repo_name != repository.name: - message = repository_maintenance_util.validate_repository_name( repo_name, user ) + message = repository_maintenance_util.validate_repository_name( trans.app, repo_name, user ) if message: error = True else: diff -r 7e45d419c54da8122f7b5d8e0ace3641e450a727 -r 9c5a2c5f560dbd769b44d684f657625563d52022 lib/tool_shed/util/repository_maintenance_util.py --- a/lib/tool_shed/util/repository_maintenance_util.py +++ b/lib/tool_shed/util/repository_maintenance_util.py @@ -137,7 +137,7 @@ results_message += 'This Tool Shed does not have the category <b>%s</b> so it will not be associated with this repository.' % \ str( category_name ) else: - category_ids.append( trans.security.encode_id( category.id ) ) + category_ids.append( trans.security.encode_id( category.id ) ) # Create the repository record in the database. repository, create_message = create_repository( trans, name, @@ -157,15 +157,18 @@ import_results_tups.append( ( ( str( name ), str( username ) ), results_message ) ) return import_results_tups -def validate_repository_name( name, user ): +def validate_repository_name( app, name, user ): # Repository names must be unique for each user, must be at least four characters # in length and must contain only lower-case letters, numbers, and the '_' character. if name in [ 'None', None, '' ]: return 'Enter the required repository name.' if name in [ 'repos' ]: return "The term <b>%s</b> is a reserved word in the tool shed, so it cannot be used as a repository name." % name - for repository in user.active_repositories: - if repository.name == name: + check_existing = suc.get_repository_by_name_and_owner( app, name, user.username ) + if check_existing is not None: + if check_existing.deleted: + return 'You have a deleted repository named <b>%s</b>, so choose a different name.' % name + else: return "You already have a repository named <b>%s</b>, so choose a different name." % name if len( name ) < 4: return "Repository names must be at least 4 characters in length." https://bitbucket.org/galaxy/galaxy-central/commits/b128bbaf91fc/ Changeset: b128bbaf91fc Branch: search User: inithello Date: 2013-12-11 19:11:43 Summary: Close branch search Affected #: 0 files https://bitbucket.org/galaxy/galaxy-central/commits/42a88bd063ee/ Changeset: 42a88bd063ee User: inithello Date: 2013-12-11 19:15:36 Summary: Merge in 11692:9c5a2c5f560d Affected #: 2 files diff -r 9c5a2c5f560dbd769b44d684f657625563d52022 -r 42a88bd063ee84f0d1ddb38ddcff564421ed8140 lib/galaxy/tools/deps/__init__.py --- a/lib/galaxy/tools/deps/__init__.py +++ b/lib/galaxy/tools/deps/__init__.py @@ -76,6 +76,7 @@ return [ ToolShedPackageDependencyResolver(self), GalaxyPackageDependencyResolver(self), + GalaxyPackageDependencyResolver(self, versionless=True), ] def __parse_resolver_conf_xml(self, root): diff -r 9c5a2c5f560dbd769b44d684f657625563d52022 -r 42a88bd063ee84f0d1ddb38ddcff564421ed8140 test/unit/test_tool_deps.py --- a/test/unit/test_tool_deps.py +++ b/test/unit/test_tool_deps.py @@ -42,9 +42,10 @@ dependency = dm.find_dep( "dep1", None ) assert dependency.version == "2.0" - ## Test default will not be fallen back upon by default + ## Test default resolve will be fall back on default package dependency + ## when using the default resolver. dependency = dm.find_dep( "dep1", "2.1" ) - assert dependency == INDETERMINATE_DEPENDENCY + assert dependency.version == "2.0" # 2.0 is defined as default_version TEST_REPO_USER = "devteam" 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.