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

[24.1] Fix various packages' issues #18301

Merged

Conversation

nsoranzo
Copy link
Member

@nsoranzo nsoranzo commented Jun 2, 2024

I've discovered another problem that was hiding various packaging issues: when running pytest from packages/test.sh it was using our main pytest.ini as configfile, therefore setting its rootdir wrong and using lib as pythonpath (see https://docs.pytest.org/en/stable/reference/customize.html#initialization-determining-rootdir-and-configfile for how this works).
This PR adds a pytest.ini file to each package directory and fix the issues that this revealed (in particular the carbon data loading which was already known, see #17159).

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.

Fix the galaxy-config package wrongly depending on galaxy-app.
Also move the carbon_emissions unit tests to the `app/` subdirectory.

Refines @mvdbeek's proposed patch from galaxyproject#17159 (comment) .

Close galaxyproject#17159 .
Also:
- Add missing `graphene` and `graphql-core` dependencies to
  `pyproject.toml` (already installed as other dependencies' deps,
  but explicitly imported by ToolShed code).
- Move `test_tool_validation.py` unit tests to the galaxy-tool-shed
  package.
Previously, when running pytest from `packages/test.sh`, it was using
our main `pytest.ini` as configfile, therefore setting the wrong
rootdir and using `lib` as `pythonpath`.
This was hiding various packaging issues fixed in the previous commits.
@mvdbeek
Copy link
Member

mvdbeek commented Jun 3, 2024

Excellent, thank so much @nsoranzo!

@mvdbeek mvdbeek merged commit 60fbf43 into galaxyproject:release_24.1 Jun 3, 2024
50 of 51 checks passed
@nsoranzo nsoranzo deleted the release_24.1_fix_packages branch June 3, 2024 13:14
@galaxyproject galaxyproject deleted a comment from github-actions bot Jun 3, 2024
@jdavcs jdavcs added this to the 24.1 milestone Jun 19, 2024
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.

None yet

3 participants