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.

Sign up for GitHub

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

Jump to bottom

Python package fixes #311156

Closed
wants to merge 5 commits into from
Closed

Python package fixes #311156

wants to merge 5 commits into from

Conversation

pyrox0
Copy link
Member

@pyrox0 pyrox0 commented May 12, 2024 •
edited
Loading

Fixes a few packages that are broken on python 3.12, mainly related to their usage of nose, by disabling tests or otherwise migrating them to pytestCheckHook.
This also migrates binwalk to the supported fork at OSPG/binwalk, which also fixes a nose issue by it migrating to pytest.

Description of changes

Things done

  • Built on platform(s)
    • x86_64-linux
    • aarch64-linux
    • x86_64-darwin
    • aarch64-darwin
  • For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
    • sandbox = relaxed
    • sandbox = true
  • Tested, as applicable:
  • Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
  • Tested basic functionality of all binary files (usually in ./result/bin/)
  • 24.05 Release Notes (or backporting 23.05 and 23.11 Release notes)
    • (Package updates) Added a release notes entry if the change is major or breaking
    • (Module updates) Added a release notes entry if the change is significant
    • (Module addition) Added a release notes entry if adding a new NixOS module
  • Fits CONTRIBUTING.md.

Add a 👍 reaction to pull requests you find important.

@ofborg ofborg bot added the 8.has: package (new) This PR adds a new package label May 12, 2024
@ofborg ofborg bot requested review from domenkozar, layus, risicle and bennofs May 12, 2024 20:25
layus
layus approved these changes May 13, 2024
View reviewed changes
Copy link
Member

@layus layus left a comment

Choose a reason for hiding this comment

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

Looks okay to me. I do not understand why you have taken on you to change the with lib; from meta, but I am not one to bikeshed on these things.

Thanks for the work.
I will wait a bit to let others review it too. Do not hesitate to ping me if it is not merged withing the next few days.

@wegank wegank added 12.approvals: 1 This PR was reviewed and approved by one reputable person 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package labels May 13, 2024
natsukium
natsukium requested changes May 14, 2024
View reviewed changes
Copy link
Member

@natsukium natsukium left a comment •
edited
Loading

Choose a reason for hiding this comment

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

I recommend submitting one PR per package next time.

In #311054, hexa says

On top of that, packages relying on nose have largely been unmaintained and might be dead leafs or using another test framework entirely. It is also to be expected that they need to be converted to the PEP517 builder in the process of fixing them.

This indicates that we need to change the packages significantly.

pkgs/development/python-modules/binwalk/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/binwalk/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/binwalk/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/blessings/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/blessings/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/cgroup-utils/default.nix Show resolved Hide resolved
pkgs/development/python-modules/cgroup-utils/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/chart-studio/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/citeproc-py/default.nix Outdated Show resolved Hide resolved
pkgs/development/python-modules/citeproc-py/default.nix Show resolved Hide resolved
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label May 22, 2024
@pyrox0 pyrox0 force-pushed the nose-removal-1 branch 2 times, most recently from f679dd2 to bfca717 Compare May 25, 2024 23:01
@natsukium natsukium mentioned this pull request May 26, 2024
Closed
@pyrox0 pyrox0 requested a review from natsukium May 28, 2024 05:25
@wegank wegank removed the 12.approvals: 1 This PR was reviewed and approved by one reputable person label May 29, 2024
@MidAutumnMoon MidAutumnMoon mentioned this pull request Jun 11, 2024
Closed
1 task
@pyrox0
Copy link
Member Author

pyrox0 commented Jun 17, 2024

Updated to fix previous merge conflicts.

@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jun 17, 2024
@ofborg ofborg bot requested review from bcdarwin, jonringer and layus June 17, 2024 17:18
@wegank wegank added the 2.status: merge conflict This PR has merge conflicts with the target branch label Jul 4, 2024
@pyrox0 pyrox0 force-pushed the nose-removal-1 branch 2 times, most recently from 9752915 to 4724e85 Compare July 9, 2024 05:23
@pyrox0
Copy link
Member Author

pyrox0 commented Jul 9, 2024

This previously had changes related to Capstone's Python bindings. Those have been dropped as out-of-scope for this PR, and can be resubmitted later once upstream fully drops distutils in a later release.

@ofborg ofborg bot removed the 2.status: merge conflict This PR has merge conflicts with the target branch label Jul 9, 2024
@amarshall
Copy link
Member

FYI binwalk got updated to fork in #326295

pyrox0 added 5 commits July 12, 2024 21:18
@pyrox0
python312Packages.citeproc-py: nose -> pytest
03c9ae1
@pyrox0
python312Packages.chart-studio: nose -> pytest
68fee0e
@pyrox0
python312Packages.cgroup-utils: nose -> tests disabled
0e17d68 
They require privilaged filesystem access(/proc), so they do not run in
Nix's sandbox.
@pyrox0
python312Packages.blessings: nose -> disabled tests
2275343 
See upstream PR NixOS#165 for details
@pyrox0
python312Packages.binwalk: 2.3.4 -> 2.4.1
7a4e673 
Updates to the community supported fork of binwalk, and modernizes the
code to modern Nix Python packaging standards.
@pyrox0
Copy link
Member Author

pyrox0 commented Jul 13, 2024

merge conflict fixed.

@pyrox0
Copy link
Member Author

pyrox0 commented Jul 26, 2024

Closing since this has been superseded by multiple other PRs and it's no longer needed.

@pyrox0 pyrox0 closed this Jul 26, 2024
@pyrox0 pyrox0 deleted the nose-removal-1 branch August 4, 2024 23:21
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@natsukium natsukium natsukium requested changes

@jonringer jonringer jonringer left review comments

@7c6f434c 7c6f434c 7c6f434c left review comments

@domenkozar domenkozar Awaiting requested review from domenkozar

@risicle risicle Awaiting requested review from risicle

@bennofs bennofs Awaiting requested review from bennofs

@bcdarwin bcdarwin Awaiting requested review from bcdarwin

@layus layus Awaiting requested review from layus

Assignees
No one assigned
Labels
6.topic: python 8.has: package (new) This PR adds a new package 10.rebuild-darwin: 11-100 10.rebuild-linux: 11-100 12.approved-by: package-maintainer This PR was reviewed and approved by a maintainer listed in the package
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@pyrox0 @amarshall @layus @7c6f434c @jonringer @natsukium @wegank