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

Merge 24.1 #18386

Merged
merged 19 commits into from
Jun 13, 2024
Merged

Merge 24.1 #18386

merged 19 commits into from
Jun 13, 2024

Conversation

jdavcs
Copy link
Member

@jdavcs jdavcs commented Jun 12, 2024

(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 and others added 18 commits June 7, 2024 16:44
This seems like it would also help with
galaxyproject/pulsar#364.

It probably fixes galaxyproject#18347.
This passes the version prop to the routes for editing and running workflows and also to the `InvokeWorkflowPayload`, so that users can run specific versions of workflows.

Fixes galaxyproject#18367
Show the name corresponding to the `WorkflowRun` form workflow's version.
And fix test that was supposed to cover this.
Fixes galaxyproject#18384
…un_edit_for_version

[24.1] Allow running and editing workflows for specific versions
Otherwise revision details are displayed in list output:

INCORRECT:
92fb564c7095 -> ddbdbc40bdc1 (gxy), add workflow_comment table
Revision ID: ddbdbc40bdc1
Revises: 92fb564c7095
Create Date: 2023-08-14 13:41:59.442243
987ce9839ecb, e93c5d0b47a9 -> 92fb564c7095 (gxy) (mergepoint), Merge alembic heads after pulling external_user_id length extension forward

EXPECTED:
92fb564c7095 -> ddbdbc40bdc1 (gxy), add workflow_comment table
987ce9839ecb, e93c5d0b47a9 -> 92fb564c7095 (gxy) (mergepoint), Merge alembic heads after pulling external_user_id length extension forward
The bug was introduced when moving this code to SQLAlchemy 2.0
The statement in generate_next_available_username should be evaluated at
each step of the iteration: only then will the new value of `i` result
in a new statement.
…f_still_running

[24.0] Kill pulsar job if job stopped on galaxy side
…check

[24.0] Fix null inputs in database operation tools
…in_db

[24.1] Fix empty usernames in database + bug in username generation
@jdavcs jdavcs added the merge label Jun 12, 2024
@jdavcs jdavcs added this to the 24.2 milestone Jun 12, 2024
@jdavcs
Copy link
Member Author

jdavcs commented Jun 12, 2024

The failures are due to db migrations (new migrations in dev + new migration in 24.1 => multiple heads; need a merge migration). I'll fix this.

@jdavcs jdavcs merged commit 1dcb564 into galaxyproject:dev Jun 13, 2024
40 of 46 checks passed
@nsoranzo nsoranzo mentioned this pull request Jun 13, 2024
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants