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

sherlock: 0-unstable-2024-06-04 -> 0-unstable-2024-06-09 #313395

Open
wants to merge 2 commits into
base: master
Choose a base branch
from

Conversation

applePrincess
Copy link
Contributor

@applePrincess applePrincess commented May 21, 2024

Description of changes

Update to 2024-06-09

  • Move to pytest/tox based testing.

sherlock-project/sherlock@ef124ac...d678908

I am notified by the upstream as sherlock-project/sherlock/issues/2111 and sherlock-project/sherlock/issues/2127 are almost ready which will use tox and poetry instead.

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.

@ppfeister
Copy link

@applePrincess Upstream merged.

Not sure if your build needs builds to succeed offline or not, but in case they do (as with rpms)...
tox -e offline will exclude those unit tests that require an internet connection.
If running pytest directly, rather than through tox, pytest -m "not online" will achieve the same.

@applePrincess applePrincess force-pushed the sherlock-tox branch 3 times, most recently from 8437d4f to 20932f6 Compare June 10, 2024 05:52
@applePrincess applePrincess marked this pull request as ready for review June 10, 2024 05:56
@applePrincess
Copy link
Contributor Author

Indeed it needs to be offline to successfully build a package. (at least on Nixpkgs' GitHub Action and on Nixpkgs' hydra CI system)

@applePrincess applePrincess changed the title Sherlock use tox sherlock: 0-unstable-2024-06-04 -> 0-unstable-2024-06-09 Jun 10, 2024
@applePrincess applePrincess changed the title sherlock: 0-unstable-2024-06-04 -> 0-unstable-2024-06-09 sherlock: 0-unstable-2024-06-04 -> 0-unstable-2024-06-09 Jun 10, 2024
@applePrincess
Copy link
Contributor Author

Result of nixpkgs-review pr 313395 run on x86_64-linux 1

2 packages built:
  • sherlock
  • sherlock.dist

Copy link
Contributor

@JohnRTitor JohnRTitor left a comment

Choose a reason for hiding this comment

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

Approved.

Perhaps move it to pkgs/by-name as well?

So when ryantm bot ends up bumping this, you can merge it using nixpkgs-merge-bot, as you are the maintainer.

@applePrincess
Copy link
Contributor Author

Done

@JohnRTitor
Copy link
Contributor

JohnRTitor commented Jun 10, 2024

Moving to pkgs/by-name should be done in a seperate commit like 96f6a37.

@JohnRTitor
Copy link
Contributor

Result of nixpkgs-review pr 313395 run on x86_64-linux 1

2 packages built:
  • sherlock
  • sherlock.dist

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants