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 default involucro path #8360

Merged
merged 1 commit into from Jul 22, 2019
Merged

Conversation

@mvdbeek
Copy link
Member

mvdbeek commented Jul 19, 2019

BaseAppConfiguration.root is now an absolute path, and so is
BaseAppConfiguration.data_dir, so the result of
resolve_path(kwargs.get("tool_dependency_dir", "dependencies"), self.data_dir)
is not "none" as it used to be, but "<galaxy_data_dir>/none" and so
the fallback will not be used.

This can be fixed by setting the default target dir to dependencies
and join it to self.data_dir, which defaults to galaxy_root/database
on classic installations.

Fixes the issues in #8195 (comment)

BaseAppConfiguration.root is now an absolute path, and so is
BaseAppConfiguration.data_dir, so the result of
`resolve_path(kwargs.get("tool_dependency_dir", "dependencies"), self.data_dir)`
is not "none" as it used to be, but `"<galaxy_data_dir>/none"` and so
the fallback will not be used.

This can be fixed by setting the default target dir to `dependencies`
and join it to self.data_dir, which defaults to `galaxy_root/database`
on classic installations.

Fixes the issues in #8195 (comment)
@mvdbeek mvdbeek force-pushed the mvdbeek:fix_default_involucro_path branch from 54bcef1 to 7be55d3 Jul 19, 2019
@galaxybot galaxybot added the triage label Jul 19, 2019
@galaxybot galaxybot added this to the 19.09 milestone Jul 19, 2019
Copy link
Member

jmchilton left a comment

Amazing , thanks for fixing this up.

@mvdbeek mvdbeek merged commit 9606690 into galaxyproject:dev Jul 22, 2019
8 checks passed
8 checks passed
api test Build finished. 497 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 Build finished. 219 tests run, 0 skipped, 0 failed.
Details
get_code_and_test Workflow: get_code_and_test
Details
integration test Build finished. 318 tests run, 23 skipped, 0 failed.
Details
selenium test Build finished. 151 tests run, 2 skipped, 0 failed.
Details
toolshed test Build finished. 578 tests run, 0 skipped, 0 failed.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.