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] Build dependency manager only for galaxy app #8696

Merged
merged 2 commits into from Sep 24, 2019

Conversation

@nsoranzo
Copy link
Member

nsoranzo commented Sep 24, 2019

Fix #8656

Broken in #8152

Add test for bug introduced in #8660 when trying to fix #8656 on the dev branch.

@nsoranzo nsoranzo force-pushed the nsoranzo:release_19.09_fix_8656 branch 2 times, most recently from 6eadeac to 94f2e2e Sep 24, 2019
@ic4f
ic4f approved these changes Sep 24, 2019
Copy link
Member

ic4f left a comment

I don't know this part of the codebase in sufficient depth, so I've only added a couple of general comments. Most importantly, I agree with the change from checking the app name to checking an (explicitly named) config property. Better design + intuitive read. Thanks!

lib/galaxy/webapps/tool_shed/app.py Outdated Show resolved Hide resolved
test/base/driver_util.py Show resolved Hide resolved
lib/galaxy/tools/toolbox/base.py Outdated Show resolved Hide resolved
Copy link
Member

jmchilton left a comment

I slightly preferred the check on app for different reasons than @ic4f's critique but that is also a valid point. I don't feel strongly about it though so approving as is - feel free to merge. Thanks for the fix @nsoranzo - sorry about breaking this.

nsoranzo and others added 2 commits Sep 24, 2019
Fix #8656

Broken in #8152

Add test for bug introduced in #8660
when trying to fix #8656 on the dev branch.
@nsoranzo nsoranzo force-pushed the nsoranzo:release_19.09_fix_8656 branch from 94f2e2e to 0cc9f27 Sep 24, 2019
@guerler guerler merged commit 682929a into galaxyproject:release_19.09 Sep 24, 2019
10 checks passed
10 checks passed
api test Build finished. 510 tests run, 1 skipped, 0 failed.
Details
api test python 3 Build finished. 510 tests run, 1 skipped, 0 failed.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
doc building test Build finished. No test results found.
Details
framework test python 3 Build finished. 220 tests run, 0 skipped, 0 failed.
Details
get_code_and_test Workflow: get_code_and_test
Details
integration test Build finished. 323 tests run, 27 skipped, 0 failed.
Details
integration test python 3 Build finished. 323 tests run, 27 skipped, 0 failed.
Details
selenium test python 3 Build finished. 152 tests run, 2 skipped, 0 failed.
Details
toolshed test Build finished. 578 tests run, 0 skipped, 0 failed.
Details
@nsoranzo nsoranzo deleted the nsoranzo:release_19.09_fix_8656 branch Sep 24, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
4 participants
You can’t perform that action at this time.