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

Refactor upload.py toward reuse #5229

Merged
merged 4 commits into from Dec 18, 2017

Conversation

Projects
None yet
4 participants
@jmchilton
Member

jmchilton commented Dec 15, 2017

Small refactorings from #5220 that make uploady.py a little more decomposable, a little more clean, a just a bit more efficient.

@galaxybot galaxybot added this to the 18.01 milestone Dec 15, 2017

@dannon dannon merged commit 6bf5d66 into galaxyproject:dev Dec 18, 2017

6 checks passed

api test Build finished. 336 tests run, 4 skipped, 0 failed.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
framework test Build finished. 165 tests run, 0 skipped, 0 failed.
Details
integration test Build finished. 60 tests run, 0 skipped, 0 failed.
Details
selenium test Build finished. 117 tests run, 1 skipped, 0 failed.
Details
toolshed test Build finished. 577 tests run, 0 skipped, 0 failed.
Details
@@ -76,7 +82,7 @@ def add_file(dataset, registry, json_file, output_path):
line_count = None
converted_path = None
stdout = None
link_data_only = dataset.get('link_data_only', 'copy_files')
link_data_only = dataset.get('link_data_only', 'copy_files') != 'copy_files'

This comment has been minimized.

@nsoranzo

nsoranzo Dec 18, 2017

Member

I think we should check that the value is in ('link_data_only', 'copy_files').

This comment has been minimized.

@jmchilton

jmchilton Dec 20, 2017

Member

I've included this check in #5220 - I'm not sure that PR will make 18.01 so if you believe this is urgent I can backport it into its own PR.

This comment has been minimized.

@nsoranzo

nsoranzo Dec 20, 2017

Member

That's fine for me, thanks @jmchilton!

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