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
Move pluggy to separate module #32392
Conversation
This commit moves pluggy (which was long forgotten) to a separate module. Pytest introduces pluggy as a dependency. To be able to react easier to that and to keep it updated more frequently via `update-python-libraries.sh` it is moved to a separate module.
buildPythonPackage rec { | ||
pname = "pluggy"; | ||
version = "0.6.0"; | ||
name = "${pname}-${version}"; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
name can be removed
sha256 = "7f8ae7f5bdf75671a718d2daf0a64b7885f74510bcd98b1a0bb420eb9a9d0cff"; | ||
}; | ||
|
||
checkInputs = stdenv.lib.optionals doCheck [ pytest ]; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
stdenv.lib.optionals doCheck
is exactly what checkInputs
already does. So remove this line.
pkgs/top-level/python-packages.nix
Outdated
@@ -230,6 +230,8 @@ in { | |||
|
|||
intelhex = callPackage ../development/python-modules/intelhex { }; | |||
|
|||
lmtpd = callPackage ../development/python-modules/lmtpd { }; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What's up with this reference?
pkgs/top-level/python-packages.nix
Outdated
@@ -344,6 +346,8 @@ in { | |||
|
|||
rhpl = disabledIf isPy3k (callPackage ../development/python-modules/rhpl {}); | |||
|
|||
salmon = callPackage ../development/python-modules/salmon { }; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What's up with this reference?
Furthermore, if your changes are inside |
Thank you for the fast feedback. I worked in the changes. Regarding the two references. I actually dont know how they slipped in, but I removed them ofc.
Noted. Next time I'll have a look at the file history first. |
@@ -0,0 +1,24 @@ | |||
{ stdenv, buildPythonPackage, fetchPypi, pytest, six, doCheck ? true }: |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
doCheck should not be there. Its not used, and overriding that kind of attribute should be done with overridePythonAttrs
.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Okay, good to know. It was a left over from the hypothesis module.
@FRidh is there anything else you want changed or that doesn't fit? Please, let me know if I can assist in any way. |
@FRidh please let me know whether we can close this. I've seen you recently updated pluggy and pytest on master. I guess this one can be closed? |
Thanks for the reminder. It seems I pushed a similar change myself last month as part of larger changes. Thanks anyway for your effort! |
Motivation for this change
This commit moves pluggy (which was long forgotten) to a separate
module. Pytest introduces pluggy as a dependency. To be able to
react easier to that and to keep it updated more frequently via
update-python-libraries.sh
it is moved to a separate module.Things done
build-use-sandbox
innix.conf
on non-NixOS)nix-shell -p nox --run "nox-review wip"
./result/bin/
) (ran an interactive python with the newly built pluggy)