-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Install via conda #2554
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
Install via conda #2554
Conversation
@bwlang might be a good idea to also include/review https://github.com/galaxyproject/galaxy/pull/2538/files |
I think this is now ready for some feedback. Todo: give the user some feedback about whether the installation was successful. |
@mvdbeek what do you think... |
</table> | ||
</td> | ||
</tr> | ||
</%def> | ||
|
||
<%def name="render_resolver_dependency_items( resolver_dependencies )"> | ||
<%def name="render_resolver_dependencies ( resolver_dependencies )"> |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Can we remove the spaces?
There are still a few things to sort out:
We also discussed an overview page of all requirements ("Manage tool requirements" ?) with @jmchilton , so that the admin can see all requirements of all tools, the resolver status of these and a list of tools/repositories that depend on these requirements, but I think that would be another PR. |
for requirement in tool.requirements: | ||
if requirement.type == 'package': | ||
reqs.append(json.dumps(requirement.to_dict())) | ||
reqs = [json.loads(req) for req in list(set(reqs))] |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
No need to cast to list.
90acf71
to
7db313b
Compare
This is amazing - what is left to do? Is there some chance to get some of this into 15.07? |
Just need to fix the failing tests and rebase... Other than that it's pretty complete by now. |
working: - fetching valid tool list - identifying unique requirements not working: File '/Users/langhorst/src/galaxy_hackathon/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py', line 1138 in prepare_for_install [view.manager_dependency(req) for req in uniq_reqs.values()] TypeError: manager_dependency() takes exactly 1 argument (2 given)
@@ -81,9 +81,9 @@ def _find_possible_depenencies(self, name, version, type): | |||
for revision in listdir(package_path): | |||
revision_path = join(package_path, revision) | |||
package = self._galaxy_package_dep(revision_path, version, True) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
package = self._galaxy_package_dep(revision_path, version, name, True)
|
||
# Finds all possible dependency to use | ||
# Should be extended as required | ||
# Returns CandidateDepenency objects with data for preference picking | ||
# Returns CandidateDependency objects with data for preference picking | ||
def _find_possible_depenencies(self, name, version, type): |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
s/depenencies/dependencies/
I'd like to rework some of the user-facing GUI aspects of this: Currently the wording is something like:
I'd like it to be something more like:
|
The UI does seem a bit confusing, mostly because it has been confusing before. Is there a reasonable scenario where you want to get both Conda and TS dependency installations? I feel like a radiobutton would be a better UI choice here. I also agree with @jmchilton that we should reword the text descriptions (like the 'un-check to skip' language)
Yes. Yes. |
@martenson I don't think the admin has a way of really knowing which they want - and for a large suite the answer is probably going to be both for a while. I've been playing around with the biom stuff - where there is no tool_dependencies.xml and I do think with a small patch I have - things are more clear than they have even been. |
…able. Also reword different install options, I hope this is more clear - I do think it exposes les of the internal language to the end user.
Also this builds on the older UI for tool installations. Would be nice to have this merged into the currently Beta API installation UI - #1392 The schedule of such is a bit tricky, I guess we continue with this PR as is and hope to port the changes to the new UI in 16.10? |
Thanks @mvdbeek for fixing all my nitpicking! I leave it to @martenson and @jmchilton for more review, testing and hopefully merging! |
Opened a PR with some of the changes @martenson and I mentioned here: bxlab#56. |
I'm getting an itchy merge finger ... and other important requests before this merged? I think we can make clarifications after the merge as usability bug fixes. |
Awesome, thanks everyone! |
Fix broken toolshed tests with #2554
Fix unit test broken in galaxyproject#2554
This option was introduced with galaxyproject#2554 and galaxyproject#2538, in reponse to a false positive conda install. This would have been caught by simply checking the exit code, which we are doing by default now. The additional verification is too strigent and not in line with the conda resolver. Activating this option will report perfectly well installed conda environments as having failed and will cause them to be uninstalled.
This is @bwlang and my project for the gcc hackathon (also see bxlab#39).
The actual place where we're doing the install still needs to move,
we should somehow show the requirement resolution to the admin in the UI
and the API could use a little reworking.