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

Merge 23.0 into dev #16197

Merged
merged 7 commits into from Jun 6, 2023
Merged

Merge 23.0 into dev #16197

merged 7 commits into from Jun 6, 2023

Conversation

mvdbeek
Copy link
Member

@mvdbeek mvdbeek commented Jun 6, 2023

(Please replace this header with a description of your pull request. Please include BOTH what you did and why you made the changes. The "why" may simply be citing a relevant Galaxy issue.)
(If fixing a bug, please add any relevant error or traceback)
(For UI components, it is recommended to include screenshots or screencasts)

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 and all my past contributions to the core galaxy codebase under the MIT license.

@mvdbeek
Make point release script compatible with docutils 0.16
e2e7cbc
@mvdbeek
Support ro-crate >=0.8.0 and 0.7.0
7cb93b3 
I guess there's a chance downstream users may run into version conflicts
if we pin ro-cate to 0.7.0, and we also don't really want to bump stable
version dependencies.
@mvdbeek
Fail if local branch doesn't match remote branch
7056942
@mvdbeek
Merge pull request galaxyproject#16190 from mvdbeek/docutils_fallback
2a5b442 
[23.0] Make point release script compatible with docutils 0.16
@mvdbeek
Merge pull request galaxyproject#16193 from mvdbeek/support_ro_crate_…
133b0a5 
…0_8_0_and_0_7_0

[23.0] Support ro crate 0.8.0 and 0.7.0
@mvdbeek
Merge pull request galaxyproject#16195 from mvdbeek/quit_if_branches_…
5c24606 
…not_updated

[23.0] Assert that local branches are up to date in release point script
@mvdbeek
Merge branch 'release_23.0' into dev
368dfb3
@github-actions github-actions bot added area/database Galaxy's database or data access layer area/scripts area/testing labels Jun 6, 2023
@github-actions github-actions bot added this to the 23.1 milestone Jun 6, 2023
@martenson martenson added the merge label Jun 6, 2023
@mvdbeek mvdbeek merged commit 9758ef4 into galaxyproject:dev Jun 6, 2023
40 of 41 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
area/database Galaxy's database or data access layer area/scripts area/testing merge
Projects
None yet
Milestone
23.1
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@mvdbeek @martenson