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

[22.01] Backport and fix webapps tests #13478

Merged

Conversation

mvdbeek
Copy link
Member

@mvdbeek mvdbeek commented Mar 3, 2022

This broke the packing tests on dev after merging #13461 into dev,

Backport of #13402

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

Also:
- Remove redundant `galaxy.schema` module from the `app` package (it's
  already in `data`)
- Fix requirements of the `app` and `webapps` packages
- Add missing `PyJWT` and `python-dateutil` to `tool.poetry.dependencies`
  (which were already included in the pinned requirements as deps of deps)
And restore unit tests to proper place.
@mvdbeek mvdbeek force-pushed the backport_and_fix_webapps_tests branch from 847bb4e to 873d43e Compare March 3, 2022 15:57
@mvdbeek mvdbeek marked this pull request as ready for review March 3, 2022 17:22
@github-actions github-actions bot added this to the 22.05 milestone Mar 3, 2022
@nsoranzo nsoranzo self-assigned this Mar 3, 2022
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.

as far as I can tell, this should work. Thanks!

@nsoranzo nsoranzo modified the milestones: 22.05, 22.01 Mar 3, 2022
@jdavcs jdavcs merged commit aee1fa5 into galaxyproject:release_22.01 Mar 3, 2022
@nsoranzo nsoranzo deleted the backport_and_fix_webapps_tests branch March 3, 2022 22:27
@@ -1,4 +1,3 @@
mock-ssh-server
pykwalify
Copy link
Member

Choose a reason for hiding this comment

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

Just noticed while merging forward that this shouldn't have been moved to packages/app/requirements.txt, so I haven't retained this change in the merge. Probably not that important to fix in 22.01.

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