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

nixos/test-driver: apply ruff check suggestions #358150

Merged
merged 6 commits into from
Nov 22, 2024
Merged

nixos/test-driver: apply ruff check suggestions #358150

merged 6 commits into from
Nov 22, 2024

Conversation

NickCao
Copy link
Member

@NickCao NickCao commented Nov 22, 2024

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/)
  • 25.05 Release Notes (or backporting 24.11 and 25.05 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.

@NickCao NickCao mentioned this pull request Nov 22, 2024
Merged
13 tasks
@github-actions github-actions bot added 6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: testing Tooling for automated testing of packages and modules labels Nov 22, 2024
@nix-owners nix-owners bot requested a review from tfc November 22, 2024 14:17
@Mic92
Copy link
Member

Mic92 commented Nov 22, 2024 •
edited
Loading

We should probably also switch to ruff instead of flake8.

@mweinelt
Copy link
Member

Please add nixosTests.nixos-test-driver into ruffs passthru tests.

@NickCao
Copy link
Member Author

NickCao commented Nov 22, 2024 •
edited
Loading

We should probably also switch to ruff instead of flake8.

We are already on ruff. Maybe get rid of black as well?

@NickCao
Copy link
Member Author

NickCao commented Nov 22, 2024 •
edited
Loading

Please add nixosTests.nixos-test-driver into ruffs passthru tests.

It's an attrset, does it work that way?

@mweinelt
Copy link
Member

mweinelt commented Nov 22, 2024 •
edited
Loading

You probably have to inherit from nixosTests.nixos-test-driver then.

I would just reference nixosTests.nixos-test-driver.busybox.

@NickCao
Copy link
Member Author

NickCao commented Nov 22, 2024

Done, also modernized it a bit with the new build-system and dependencies attributes.

@NickCao NickCao closed this Nov 22, 2024
@NickCao NickCao reopened this Nov 22, 2024
GaetanLepage
GaetanLepage approved these changes Nov 22, 2024
View reviewed changes
Copy link
Contributor

@GaetanLepage GaetanLepage left a comment

Choose a reason for hiding this comment

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

LGTM, sorry for breaking the package :/

@Mic92
Copy link
Member

Mic92 commented Nov 22, 2024

@ofborg test ferm

@mweinelt
Copy link
Member

@ofborg test ferm

Sorry, will not leave master in a broken state until ofborg comes around. The ferm tests works, tested locally.

@NickCao Please squash the fixup commit.

@NickCao
Copy link
Member Author

NickCao commented Nov 22, 2024

@NickCao Please squash the fixup commit.

Done

@GaetanLepage
Copy link
Contributor

nixpkgs-review result

Generated using nixpkgs-review.

Command: nixpkgs-review pr 358150

x86_64-linux

⏩ 1 package blacklisted:
  • nixos-install-tools

aarch64-linux

⏩ 1 package blacklisted:
  • nixos-install-tools

x86_64-darwin

aarch64-darwin

@mweinelt
Copy link
Member

@GaetanLepage That was entirely pointless, since it didn't get built in the ruff bump PR either and nothing here changed that.

@mweinelt mweinelt merged commit b9dec6d into NixOS:master Nov 22, 2024
17 of 18 checks passed
@NickCao NickCao deleted the test-driver-ruff branch November 22, 2024 16:03
@GaetanLepage
Copy link
Contributor

@GaetanLepage That was entirely pointless, since it didn't get built in the ruff bump PR either and nothing here changed that.

Yes, I thought the driver would rebuild, but it is not triggered by nixpkgs-review. Sorry for the useless ping.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@GaetanLepage GaetanLepage GaetanLepage approved these changes

@ambroisie ambroisie ambroisie approved these changes

@mweinelt mweinelt mweinelt approved these changes

@tfc tfc Awaiting requested review from tfc

Assignees
No one assigned
Labels
6.topic: nixos Issues or PRs affecting NixOS modules, or package usability issues specific to NixOS 6.topic: testing Tooling for automated testing of packages and modules
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
5 participants
@NickCao @Mic92 @mweinelt @GaetanLepage @ambroisie