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

Print package file name in get_hash_input #5021

Merged
merged 5 commits into from
Oct 4, 2023

Conversation

duncanmmacleod
Copy link
Contributor

@duncanmmacleod duncanmmacleod commented Oct 2, 2023

Description

This PR fixes #5020 by patching conda_build.inspect_pkg.get_hash_input to use the package file basename as the hash key, rather than attempting to strip off the extension (which it currently gets wrong for .conda packages).

Checklist - did you ...

  • Add a file to the news directory (using the template) for the next release's release notes?
  • Add / update necessary tests?
  • Add / update outdated documentation?

rather than trying to strip off the suffix
@conda-bot conda-bot added the cla-signed [bot] added once the contributor has signed the CLA label Oct 2, 2023
news/5021-get_hash_input Outdated Show resolved Hide resolved
@chenghlee
Copy link
Contributor

Thanks for this change; I agree that the suggested behavior looks cleaner and makes more sense.

Current:

$ conda inspect hash-inputs zlib-1.2.13-h5eee18b_0.{tar.bz2,conda}
{'zlib-1.2.13-h5eee18b': {'recipe': {'c_compiler': 'gcc',
                                     'c_compiler_version': '11.2.0',
                                     'channel_targets': 'defaults',
                                     'target_platform': 'linux-64'}},
 'zlib-1.2.13-h5eee18b_0': {'recipe': {'c_compiler': 'gcc',
                                       'c_compiler_version': '11.2.0',
                                       'channel_targets': 'defaults',
                                       'target_platform': 'linux-64'}}}

Proposed:

$ conda inspect hash-inputs zlib-1.2.13-h5eee18b_0.{tar.bz2,conda}
{'zlib-1.2.13-h5eee18b_0.conda': {'recipe': {'c_compiler': 'gcc',
                                             'c_compiler_version': '11.2.0',
                                             'channel_targets': 'defaults',
                                             'target_platform': 'linux-64'}},
 'zlib-1.2.13-h5eee18b_0.tar.bz2': {'recipe': {'c_compiler': 'gcc',
                                               'c_compiler_version': '11.2.0',
                                               'channel_targets': 'defaults',
                                               'target_platform': 'linux-64'}}}

@kenodegard kenodegard merged commit c4abce5 into conda:main Oct 4, 2023
24 checks passed
@jezdez jezdez modified the milestone: 3.28.0 Nov 13, 2023
@kenodegard kenodegard mentioned this pull request Dec 1, 2023
67 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cla-signed [bot] added once the contributor has signed the CLA
Projects
Archived in project
Development

Successfully merging this pull request may close these issues.

conda-build hash info report truncates package name
6 participants