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

pythonPackages.pytest-timeout: update patch URL #111268

Merged
merged 1 commit into from Jan 31, 2021
Merged

pythonPackages.pytest-timeout: update patch URL #111268

merged 1 commit into from Jan 31, 2021

Conversation

twhitehead
Copy link
Contributor

Motivation for this change

Patch URL is invalid and couldn't find another, so directly included it (I've now seen several patches with sour URLs, why not just include it in the first place and the potential for this pain?).

Things done

Add the patch directly.

  • Tested using sandboxing (nix.useSandbox on NixOS, or option sandbox in nix.conf on non-NixOS linux)
  • Built on platform(s)
    • NixOS
    • macOS
    • other Linux distributions
  • Tested via one or more NixOS test(s) if existing and applicable for the change (look inside nixos/tests)
  • Tested compilation of all pkgs that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review wip"
  • Tested execution of all binary files (usually in ./result/bin/)
  • Determined the impact on package closure size (by running nix path-info -S before and after)
  • Ensured that relevant documentation is up to date
  • Fits CONTRIBUTING.md.

jonringer
jonringer reviewed Jan 30, 2021
View reviewed changes
Copy link
Contributor

@jonringer jonringer left a comment

Choose a reason for hiding this comment

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

looks like they moved https://github.com/pytest-dev/pytest-timeout

but I'm okay with vendoring the patch.

However, the patch doesn't seem nixos specific. Is there a reason why it hasn't been merged yet?

@ofborg ofborg bot requested review from costrouc and makefu January 30, 2021 05:50
@twhitehead
Copy link
Contributor Author

It appears to have been merged in newer versions of pytest-timeout, for example and the patch is no longer specified in nixpkgs master which uses the newer version. I figured adding the patch directly was less intrusive to 20.09 then bumping the version to follow master though.

dotlambda
dotlambda requested changes Jan 30, 2021
View reviewed changes
Copy link
Member

@dotlambda dotlambda left a comment

Choose a reason for hiding this comment

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

Just replace the URL with https://github.com/pytest-dev/pytest-timeout/commit/20c2ba5ef60007b5071acfd62b326cafce0e5493.patch. Then you can even target release-20.09.

@dotlambda dotlambda changed the title python: pytest-timeout: include patch as URL is now broken pythonPackages.pytest-timeout: include patch as URL is now broken Jan 30, 2021
@twhitehead twhitehead changed the base branch from staging-20.09 to release-20.09 January 31, 2021 04:17
@twhitehead
Copy link
Contributor Author

Ok. I've switch to just updating the URL and rebased on release-20.09. Thanks!

PS: How did you find the commit on the github side? (I had thought the bitbucket URL contained the commit hash, and when I couldn't find that hash, I had assumed it didn't exist)

@dotlambda
Copy link
Member

PS: How did you find the commit on the github side? (I had thought the bitbucket URL contained the commit hash, and when I couldn't find that hash, I had assumed it didn't exist)

I just went through the history and found a matching commit message.

dotlambda
dotlambda requested changes Jan 31, 2021
View reviewed changes
Copy link
Member

@dotlambda dotlambda left a comment

Choose a reason for hiding this comment

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

You need to change the commit message.

Also, we apparently need to add name = "raw" in order to make this not cause any rebuilds. Maybe you can add a comment with the reason for adding the line.

@twhitehead
Copy link
Contributor Author

Thanks. Done and done. 👍

@dotlambda dotlambda changed the title pythonPackages.pytest-timeout: include patch as URL is now broken pythonPackages.pytest-timeout: update patch URL Jan 31, 2021
@dotlambda dotlambda merged commit bee9443 into NixOS:release-20.09 Jan 31, 2021
@SuperSandro2000
Copy link
Member

Also, we apparently need to add name = "raw" in order to make this not cause any rebuilds. Maybe you can add a comment with the reason for adding the line.

I don't mind if this causes any rebuilds and we would clean it up a bit. Python builds really fast anyway.

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

@jonringer jonringer jonringer left review comments

@dotlambda dotlambda dotlambda requested changes

@SuperSandro2000 SuperSandro2000 SuperSandro2000 requested changes

@FRidh FRidh Awaiting requested review from FRidh FRidh is a code owner

@costrouc costrouc Awaiting requested review from costrouc

@makefu makefu Awaiting requested review from makefu

Assignees
No one assigned
Labels
6.topic: python 10.rebuild-darwin: 0 10.rebuild-linux: 0
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@twhitehead @dotlambda @SuperSandro2000 @jonringer