Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[19.09] Fix data_manager_manual with new data tables + cleanup and fixes #8817

Merged
merged 19 commits into from
Oct 23, 2019

Conversation

mvdbeek
Copy link
Member

@mvdbeek mvdbeek commented Oct 17, 2019

Builds on #8792 by @abretaud

  • Fixes and unifies DM loading
  • More useful traceback when loading DM failed
  • Implement get_tool_relative_path, needed for running data_manager_manual without install db
  • Test data_manager_manual in an integration test

@mvdbeek mvdbeek force-pushed the dmfix1909 branch 4 times, most recently from 4c78302 to 6bed265 Compare October 21, 2019 10:18
@mvdbeek mvdbeek changed the title [19.09][WIP] Fix data_manager_manual with new data tables + cleanup and fixes [19.09] Fix data_manager_manual with new data tables + cleanup and fixes Oct 21, 2019
@mvdbeek
Copy link
Member Author

mvdbeek commented Oct 21, 2019

I think this is ready for review now.

lib/galaxy/tools/data_manager/manager.py Outdated Show resolved Hide resolved
lib/galaxy/tools/data_manager/manager.py Outdated Show resolved Hide resolved
lib/galaxy/tools/data_manager/manager.py Outdated Show resolved Hide resolved
@mvdbeek mvdbeek added this to the 19.09 milestone Oct 22, 2019
@bgruening
Copy link
Member

@mvdbeek here are now some conflicts.

@@ -520,7 +520,6 @@ def tool_shed_repository(self):
name=self.repository_name,
owner=self.repository_owner,
installed_changeset_revision=self.installed_changeset_revision,
repository_id=self.repository_id,
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not sure I understand this change.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

If you specify a repository_id we'll not be able to use ToolConfRepository items, which don't have an id. We should only provide the repository_id when working in the galaxy_install module.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

7 participants