Skip to content

Some refactoring and fixes for handing of conda packages#1592

Merged
nsoranzo merged 11 commits intogalaxyproject:masterfrom
bernt-matthias:topic/fix-container-hash
Dec 19, 2025
Merged

Some refactoring and fixes for handing of conda packages#1592
nsoranzo merged 11 commits intogalaxyproject:masterfrom
bernt-matthias:topic/fix-container-hash

Conversation

@bernt-matthias
Copy link
Collaborator

@bernt-matthias bernt-matthias commented Dec 17, 2025

See commit descriptions. Mainly

  • Remove conda_to_mulled_targets and collect_mulled_target_lists which were used to set the build attribute of CondaTargets to None, which is not needed:
    1. the build information was not properly parsed anyway [25.1] Properly parse build info from requirement info galaxy#21481, i.e. it was already None
    2. the v2_image_name function ignores the package build info anyway - we just need to construct the CondaTargets properly
  • Use target_str_to_targets from galaxy.tool-util which properly parses builds from the version (only affects 2 planemo conda... commands)

@bernt-matthias bernt-matthias force-pushed the topic/fix-container-hash branch from 9656eee to 97e7fec Compare December 17, 2025 14:06
@bernt-matthias bernt-matthias force-pushed the topic/fix-container-hash branch from 97e7fec to 2328f8e Compare December 17, 2025 14:12
in planemo.mulled.conda_to_mulled_targets essentially the build info
is stripped from the conda targets. that is

- conda target = (name, version, build)
- mulled target = (name, version)

since the build information has not been determined so far

- galaxyproject/galaxy#21481,
- galaxyproject/galaxy#18522

the distinction seems to make no sense.
which properly parses versions
@bernt-matthias bernt-matthias force-pushed the topic/fix-container-hash branch from 2328f8e to cd5f04d Compare December 17, 2025 14:47
bernt-matthias and others added 2 commits December 17, 2025 21:34
Co-authored-by: Nicola Soranzo <nicola.soranzo@gmail.com>
Co-authored-by: Nicola Soranzo <nicola.soranzo@gmail.com>
@bernt-matthias bernt-matthias force-pushed the topic/fix-container-hash branch from 4ac673e to fa76a27 Compare December 17, 2025 22:26
@bernt-matthias bernt-matthias force-pushed the topic/fix-container-hash branch from 95555f5 to 408d638 Compare December 17, 2025 22:32
@bernt-matthias bernt-matthias force-pushed the topic/fix-container-hash branch from 337ae2d to cc21892 Compare December 18, 2025 20:19
Co-authored-by: Nicola Soranzo <nicola.soranzo@gmail.com>
@bernt-matthias bernt-matthias force-pushed the topic/fix-container-hash branch from cc21892 to 30694f6 Compare December 18, 2025 20:23
bernt-matthias and others added 2 commits December 19, 2025 08:19
Co-authored-by: Nicola Soranzo <nicola.soranzo@gmail.com>
Co-authored-by: Nicola Soranzo <nicola.soranzo@gmail.com>
@nsoranzo nsoranzo merged commit 3385c35 into galaxyproject:master Dec 19, 2025
14 checks passed
@bernt-matthias bernt-matthias deleted the topic/fix-container-hash branch December 20, 2025 11:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants