Skip to content

[22.05] fix looks_like_yaml_or_cwl_with_class#15439

Merged
mvdbeek merged 5 commits intogalaxyproject:release_22.05from
bernt-matthias:fix-looks-like-yaml-w-class
Jan 30, 2023
Merged

[22.05] fix looks_like_yaml_or_cwl_with_class#15439
mvdbeek merged 5 commits intogalaxyproject:release_22.05from
bernt-matthias:fix-looks-like-yaml-w-class

Conversation

@bernt-matthias
Copy link
Contributor

the string class: ... might appear on the first line hence the leading \n was wrong

I guess its better to use ^ and $ and add the MULTILINE flag

Bug has been introduced here: #12604

Suggestions for tests welcome

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.

@bernt-matthias bernt-matthias changed the base branch from dev to release_22.05 January 29, 2023 12:15
@github-actions github-actions bot modified the milestones: 23.1, 23.0 Jan 29, 2023
@mvdbeek
Copy link
Member

mvdbeek commented Jan 29, 2023

Maybe plug in one of the failing documents as a test

@bernt-matthias bernt-matthias force-pushed the fix-looks-like-yaml-w-class branch from 767891f to e7d7385 Compare January 29, 2023 12:49
the string `class: ...` might appear on the first line
hence the leading `\n` was wrong

I guess its better to use `^` and `$` and add the MULTILINE flag
@bernt-matthias
Copy link
Contributor Author

OK commited a test first and test/unit/tool_util/test_loader_directory.py::test_is_a_yaml_with_class is failing https://github.com/galaxyproject/galaxy/actions/runs/4036844700/jobs/6939735971

Now, lets push the fix again.

Co-authored-by: Marius van den Beek <m.vandenbeek@gmail.com>
Copy link
Member

@mvdbeek mvdbeek left a comment

Choose a reason for hiding this comment

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

Thank you!

@bernt-matthias
Copy link
Contributor Author

Cool. Maybe we can get this and #14572 .. and get another prerelease of 22.06 packages?

@mvdbeek mvdbeek merged commit 7c8d732 into galaxyproject:release_22.05 Jan 30, 2023
@mvdbeek
Copy link
Member

mvdbeek commented Jan 30, 2023

Thank you @bernt-matthias!

@github-actions
Copy link

This PR was merged without a "kind/" label, please correct.

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.

2 participants