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

Fix dependency display and api #3427

Merged
merged 2 commits into from Jan 16, 2017

Conversation

Projects
None yet
2 participants
@mvdbeek
Copy link
Member

commented Jan 14, 2017

Fix display of repository dependency status that broke with the introduction of the all-at-once dependency resolution in #3391 and addresses in part #3398. I have only restored the (collapsed) display of dependencies for all requirements in a repository, so breaking the information out on a per tool basis remains on the TODO list. The integration API tests are passing for me as well.

I also took the liberty to cherry-pick @jmchilton exact version fix, so this should replace #3424

jmchilton and others added some commits Jan 13, 2017

Fix "exact" property for merged conda dependencies.
This was broken with there initial commit as part of #3391.
Fix display of repository dependency status
that broke with the introduction of the all-at-once dependency
resolution in #3391 and addresses in part #3398. I have only restored
the (collapsed) display of dependencies for all requirements in a
repository, so breaking the information out on a per tool basis remains
on the TODO list.

@mvdbeek mvdbeek added this to the 17.01 milestone Jan 14, 2017

@jmchilton jmchilton merged commit ebf1844 into galaxyproject:dev Jan 16, 2017

4 checks passed

api test Build finished. 256 tests run, 0 skipped, 0 failed.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
framework test Build finished. 134 tests run, 0 skipped, 0 failed.
Details
toolshed test Build finished. 580 tests run, 0 skipped, 0 failed.
Details
@jmchilton

This comment has been minimized.

Copy link
Member

commented Jan 16, 2017

Awesome sauce - thanks for the fix!

@jmchilton jmchilton referenced this pull request Jan 16, 2017

Closed

Various conda fixes. #3424

jmchilton added a commit to jmchilton/galaxy that referenced this pull request Jan 19, 2017

Fixup circular dependency in galaxyproject#3427.
Unfortunately the "root" of the problem is that galaxy.tools.deps.requirements.ToolRequirement should be importable without importing galaxy.tools - but it cannot be currently just because of the way things are structured.

dannon added a commit that referenced this pull request Jan 19, 2017

Merge pull request #3447 from jmchilton/ts_import_cycle
Fixup circular dependency in #3427.

@mvdbeek mvdbeek deleted the mvdbeek:fix_dependency_display_and_api branch Jun 12, 2018

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.