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.

Sign up for GitHub

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

Jump to bottom

[22.01] Include gravity in sample config #13531

Merged
merged 3 commits into from
Mar 15, 2022
Merged

[22.01] Include gravity in sample config #13531

merged 3 commits into from
Mar 15, 2022

Conversation

mvdbeek
Copy link
Member

@mvdbeek mvdbeek commented Mar 13, 2022

Before merging we should merge galaxyproject/gravity#42 and publish 0.11.0

How to test the changes?

(Select all options that apply)

  • I've included appropriate automated tests.
  • This is a refactoring of components with existing test coverage.
  • Instructions for manual testing are as follows:
    1. [add testing steps and prerequisites here if you didn't write automated tests covering all your changes]

License

  • I agree to license these contributions under Galaxy's current license.
  • I agree to allow the Galaxy committers to license these and all my past contributions to the core galaxy codebase under the MIT license. If this condition is an issue, uncheck and just let us know why with an e-mail to [email protected].

@mvdbeek mvdbeek requested review from jdavcs, natefoo and nsoranzo March 13, 2022 15:49
@mvdbeek mvdbeek mentioned this pull request Mar 13, 2022
Closed
32 tasks
@mvdbeek
Copy link
Member Author

mvdbeek commented Mar 13, 2022

(The startup errors are to be expected without a new gravity release)

@mvdbeek mvdbeek added this to the 22.01 milestone Mar 14, 2022
jdavcs
jdavcs approved these changes Mar 14, 2022
View reviewed changes
Copy link
Member

@jdavcs jdavcs left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good!

@mvdbeek
Copy link
Member Author

mvdbeek commented Mar 14, 2022

Thanks @ic4f, then I'll cut a new gravity release

@mvdbeek mvdbeek marked this pull request as ready for review March 15, 2022 11:02
nsoranzo
nsoranzo approved these changes Mar 15, 2022
View reviewed changes
lib/galaxy/config/config_manage.py
@@ -12,6 +12,7 @@
import requests
import yaml
from boltons.iterutils import remap
from gravity.util import settings_to_sample
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess that it won't be possible for gravity to depend on galaxy-config in the future, unless we refactor this.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We could make it a local import, or publish the config schema separately, but I thought we can do this once we're trying to do this.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This broke the test_galaxy_packages tests on CircleCI, I guess because gravity needs to be added to packages/config/requirements.txt .

@mvdbeek mvdbeek merged commit 083d94d into galaxyproject:release_22.01 Mar 15, 2022
@nsoranzo nsoranzo deleted the include_gravity_in_sample_config branch March 15, 2022 15:55
This was referenced Mar 15, 2022
Closed
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nsoranzo nsoranzo nsoranzo approved these changes

@jdavcs jdavcs jdavcs approved these changes

@natefoo natefoo Awaiting requested review from natefoo

Assignees
No one assigned
Labels
area/configuration Galaxy's configuration system kind/bug kind/enhancement
Projects
None yet
Milestone
22.01
Development

Successfully merging this pull request may close these issues.
3 participants
@mvdbeek @nsoranzo @jdavcs