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

Improvements to build sites configuration #3503

Merged
merged 1 commit into from Jan 31, 2017

Conversation

Projects
None yet
4 participants
@jmchilton
Copy link
Member

commented Jan 27, 2017

  • This fixes #3494 so that usegalaxy.org can simply use the default sample datatypes configuration file.
  • This also prevents the sample shared data files from being copied - which should be beneficial for #1472.

Ping @natefoo @martenson

@jmchilton jmchilton added this to the 17.05 milestone Jan 27, 2017

@jmchilton jmchilton changed the title Improvements to Build Sites Modification Improvements to build sites configuration Jan 27, 2017

return

site_type = build_site_config.get( 'type' )
file = build_site_config.get( 'file' )

This comment has been minimized.

Copy link
@nsoranzo

nsoranzo Jan 27, 2017

Member

It may be a good time to use a variable name which is not a Python2 reserved word.

This comment has been minimized.

Copy link
@jmchilton

jmchilton Jan 27, 2017

Author Member

Good point - done!

@nsoranzo

This comment has been minimized.

Copy link
Member

commented Jan 27, 2017

Framework tests were failing, I suppose that's related: https://jenkins.galaxyproject.org/job/docker-framework/6406/

tool-data/shared/ucsc/manual_builds.txt.sample
tool-data/shared/ucsc/ucsc_build_sites.txt.sample
tool-data/shared/igv/igv_build_sites.txt.sample
tool-data/shared/rviewer/rviewer_build_sites.txt.sample

This comment has been minimized.

Copy link
@natefoo

natefoo Jan 27, 2017

Member

+💯 for getting rid of this mess.

Pull build_sites out of datatypes conf.
So deployers may modify these paths and stil use the default datatypes config.

This should speed up set_metadata also since each of these config files won't be loaded as part of that.

@jmchilton jmchilton force-pushed the jmchilton:datatypes_build_sites branch from d44315f to 1a463f1 Jan 31, 2017

@jmchilton

This comment has been minimized.

Copy link
Member Author

commented Jan 31, 2017

Turns out the builds are different than the build sites and I removed too many things from the common startup's list of file copy actions. I have fixed that and just merged everything into one commit. Hopefully the tests pass now.

@nsoranzo nsoranzo merged commit bb318d3 into galaxyproject:dev Jan 31, 2017

4 checks passed

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

This comment has been minimized.

Copy link
Member

commented Jan 31, 2017

Thanks @jmchilton and @nsoranzo !

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.