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

Move pluggy to separate module #32392

Closed
wants to merge 4 commits into from

Conversation

maiksensi
Copy link
Contributor

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
  • Tested using sandboxing (nix.useSandbox on NixOS, or option build-use-sandbox in nix.conf on non-NixOS)
  • 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 nox --run "nox-review wip"
  • Tested execution of all binary files (usually in ./result/bin/) (ran an interactive python with the newly built pluggy)
  • Fits CONTRIBUTING.md.

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.
@maiksensi maiksensi requested a review from FRidh as a code owner December 6, 2017 20:24
buildPythonPackage rec {
pname = "pluggy";
version = "0.6.0";
name = "${pname}-${version}";
Copy link
Member

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 ];
Copy link
Member

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.

@@ -230,6 +230,8 @@ in {

intelhex = callPackage ../development/python-modules/intelhex { };

lmtpd = callPackage ../development/python-modules/lmtpd { };
Copy link
Member

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?

@@ -344,6 +346,8 @@ in {

rhpl = disabledIf isPy3k (callPackage ../development/python-modules/rhpl {});

salmon = callPackage ../development/python-modules/salmon { };
Copy link
Member

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?

@FRidh
Copy link
Member

FRidh commented Dec 7, 2017

Furthermore, if your changes are inside python-packages.nix, then prefix python or pythonPackages to the commit name.

@maiksensi
Copy link
Contributor Author

maiksensi commented Dec 7, 2017

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.

Furthermore, if your changes are inside python-packages.nix, then prefix python or pythonPackages to > the commit name

Noted. Next time I'll have a look at the file history first.

@@ -0,0 +1,24 @@
{ stdenv, buildPythonPackage, fetchPypi, pytest, six, doCheck ? true }:
Copy link
Member

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.

Copy link
Contributor Author

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.

@maiksensi
Copy link
Contributor Author

@FRidh is there anything else you want changed or that doesn't fit? Please, let me know if I can assist in any way.

@maiksensi
Copy link
Contributor Author

@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?

@FRidh
Copy link
Member

FRidh commented Mar 4, 2018

Thanks for the reminder. It seems I pushed a similar change myself last month as part of larger changes. Thanks anyway for your effort!

@FRidh FRidh closed this Mar 4, 2018
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