binwalk, diffoscope: update after Python 3.12#325623
Closed
philiptaron wants to merge 2 commits intoNixOS:masterfrom
Closed
binwalk, diffoscope: update after Python 3.12#325623philiptaron wants to merge 2 commits intoNixOS:masterfrom
philiptaron wants to merge 2 commits intoNixOS:masterfrom
Conversation
github-actions
bot
added
the
6.topic: python
Contributor
Author
|
@trofi fyi |
Member
|
Is that behavioural change in |
Contributor
Author
I was quite surprised to see it as well. You can see from the patch what the detected differences are. I checked out upstream (https://salsa.debian.org/reproducible-builds/diffoscope) locally and ran Then, with this PR (note the Python 3.12 in the derivation name): What I don't understand is how there were ever two emitted items. Master appears to have 10 as well. |
ofborg
bot
added
8.has: package (new)
This was referenced Jul 9, 2024
| def test_listing(comparison): | ||
| differences = comparison.details | ||
| - assert comparison.comments == ["comprises of 2 embedded members"] | ||
| + assert comparison.comments == ["comprises of 10 embedded members"] |
Contributor
There was a problem hiding this comment.
is this by design i.e. a number that we can rely on to continue to be 10? or might this change in the future?
|
This pull request has been mentioned on NixOS Discourse. There might be relevant details there: https://discourse.nixos.org/t/error-nose-1-3-7-not-supported-for-interpreter-python3-12/48703/22 |
13 tasks
Contributor
|
Please rebase. (And whatever new improvement/fix that isn't in 326295 can be integrated.) |
Contributor
|
Both binwalk and diffoscope appear to build on current |
Contributor
Member
|
But there’s nothing to rebase now; #326295 replaces this. |
This comment was marked as duplicate.
This comment was marked as duplicate.
Contributor
Author
Quite so. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Description of changes
binwalkuses bothimpandnosewhich are not supported on Python 3.12. See fix #667 (Python 3.12 compatibility) ReFirmLabs/binwalk#668diffoscopeunit test for binwalk now sees more cpio binaries in its test.related to #325657 (comment)
cc @Mag1cByt3s
Result of
nixpkgs-reviewrun on x86_64-linux 115 packages built:
Things done
nix.conf? (See Nix manual)sandbox = relaxedsandbox = truenix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage./result/bin/)