[galaxy-commits] commit/galaxy-central: 4 new changesets

4 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/382b019fcdc1/ Changeset: 382b019fcdc1 User: BjoernGruening Date: 2014-08-12 10:33:27 Summary: install_repository_manager do not need trans.app anymore. Affected #: 1 file diff -r 700560884da71e8bd3bdad6ddbe4edfde9566f7f -r 382b019fcdc10b72fc77a9284d7adcfeb3170cd8 lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py --- a/lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py +++ b/lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py @@ -239,8 +239,7 @@ tool_shed_url, name, owner, changeset_revision = self.__parse_repository_from_payload( payload, include_changeset=True ) self.__ensure_can_install_repos( trans ) install_repository_manager = InstallRepositoryManager( trans.app ) - installed_tool_shed_repositories = install_repository_manager.install( trans.app, - tool_shed_url, + installed_tool_shed_repositories = install_repository_manager.install( tool_shed_url, name, owner, changeset_revision, https://bitbucket.org/galaxy/galaxy-central/commits/0df3fe8e9945/ Changeset: 0df3fe8e9945 User: BjoernGruening Date: 2014-08-12 10:38:24 Summary: First argument to __install_repositories is the Tool Shed URL (tool_shed_url) Affected #: 1 file diff -r 382b019fcdc10b72fc77a9284d7adcfeb3170cd8 -r 0df3fe8e99457c75cefeab162dac3e90f948d764 lib/tool_shed/galaxy_install/install_manager.py --- a/lib/tool_shed/galaxy_install/install_manager.py +++ b/lib/tool_shed/galaxy_install/install_manager.py @@ -694,7 +694,8 @@ name, owner, changeset_revision ) - installed_tool_shed_repositories = self.__install_repositories( repository_revision_dict, + installed_tool_shed_repositories = self.__install_repositories( tool_shed_url, + repository_revision_dict, repo_info_dicts, install_options ) return installed_tool_shed_repositories https://bitbucket.org/galaxy/galaxy-central/commits/f3c84cf5296f/ Changeset: f3c84cf5296f User: BjoernGruening Date: 2014-08-12 10:41:45 Summary: initiate_repository_installation was not updated in the recent code restructuring efforts Affected #: 1 file diff -r 0df3fe8e99457c75cefeab162dac3e90f948d764 -r f3c84cf5296f6b9bed917f71693ff32dd92188f4 lib/tool_shed/galaxy_install/install_manager.py --- a/lib/tool_shed/galaxy_install/install_manager.py +++ b/lib/tool_shed/galaxy_install/install_manager.py @@ -789,7 +789,7 @@ # at this point because repository dependencies may have added additional repositories for installation # along with the single specified repository. encoded_kwd, query, tool_shed_repositories, encoded_repository_ids = \ - initiate_repository_installation( self.app, installation_dict ) + self.initiate_repository_installation( installation_dict ) # Some repositories may have repository dependencies that are required to be installed before the # dependent repository, so we'll order the list of tsr_ids to ensure all repositories install in # the required order. https://bitbucket.org/galaxy/galaxy-central/commits/2f300953ad98/ Changeset: 2f300953ad98 User: jmchilton Date: 2014-08-12 15:04:01 Summary: Merged in BjoernGruening/galaxy-central-4 (pull request #454) Fixes for recent Tool Shed code cleanups Affected #: 2 files diff -r 19309418c86450b7f39691460eb430e100883cb4 -r 2f300953ad98992a620b1f0678eb72505f8cdfc2 lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py --- a/lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py +++ b/lib/galaxy/webapps/galaxy/api/tool_shed_repositories.py @@ -239,8 +239,7 @@ tool_shed_url, name, owner, changeset_revision = self.__parse_repository_from_payload( payload, include_changeset=True ) self.__ensure_can_install_repos( trans ) install_repository_manager = InstallRepositoryManager( trans.app ) - installed_tool_shed_repositories = install_repository_manager.install( trans.app, - tool_shed_url, + installed_tool_shed_repositories = install_repository_manager.install( tool_shed_url, name, owner, changeset_revision, diff -r 19309418c86450b7f39691460eb430e100883cb4 -r 2f300953ad98992a620b1f0678eb72505f8cdfc2 lib/tool_shed/galaxy_install/install_manager.py --- a/lib/tool_shed/galaxy_install/install_manager.py +++ b/lib/tool_shed/galaxy_install/install_manager.py @@ -694,7 +694,8 @@ name, owner, changeset_revision ) - installed_tool_shed_repositories = self.__install_repositories( repository_revision_dict, + installed_tool_shed_repositories = self.__install_repositories( tool_shed_url, + repository_revision_dict, repo_info_dicts, install_options ) return installed_tool_shed_repositories @@ -788,7 +789,7 @@ # at this point because repository dependencies may have added additional repositories for installation # along with the single specified repository. encoded_kwd, query, tool_shed_repositories, encoded_repository_ids = \ - initiate_repository_installation( self.app, installation_dict ) + self.initiate_repository_installation( installation_dict ) # Some repositories may have repository dependencies that are required to be installed before the # dependent repository, so we'll order the list of tsr_ids to ensure all repositories install in # the required order. 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.