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

python3Packages.zha-quirks: 0.0.45 -> 0.0.46 #104227

Merged
merged 1 commit into from Nov 23, 2020
Merged

python3Packages.zha-quirks: 0.0.45 -> 0.0.46 #104227

merged 1 commit into from Nov 23, 2020

Conversation

freezeboy
Copy link
Contributor

(cherry picked from commit f2e91df5a0b2c187f3b66579098d476f0b48089a)

Motivation for this change

Some dependencies were missing for the tests: conftest and asynctest

Things done
  • 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.

@ofborg ofborg bot requested a review from etu November 19, 2020 00:38
jonringer
jonringer reviewed Nov 19, 2020
View reviewed changes
pkgs/development/python-modules/zha-quirks/default.nix Outdated
, pytest }:

buildPythonPackage rec {
pname = "zha-quirks";
version = "0.0.45";

nativeBuildInputs = [ pytest ];
#nativeBuildInputs = [ pytest ];
Copy link
Contributor

Choose a reason for hiding this comment

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

this shouldn't be needed, I would just remove it.

Suggested change
#nativeBuildInputs = [ pytest ];

pkgs/development/python-modules/zha-quirks/default.nix Outdated
, pytest }:

buildPythonPackage rec {
pname = "zha-quirks";
version = "0.0.45";

nativeBuildInputs = [ pytest ];
#nativeBuildInputs = [ pytest ];
buildInputs = [ aiohttp zigpy ];
Copy link
Contributor

Choose a reason for hiding this comment

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

these are python packages, should be propagatedBuildInputs

Suggested change
buildInputs = [ aiohttp zigpy ];
propagatedBuildInputs = [ aiohttp zigpy ];

@mvnetbiz
Copy link
Contributor

If #104202 gets merged first, this could also be updated to 0.0.46

@mweinelt
Copy link
Member

Can you please remove the cherry-pick reference? It does not seem like it is part of nixpkgs.

@freezeboy freezeboy force-pushed the unbreak-zha-quirks branch 2 times, most recently from 65c8e99 to 6676c02 Compare November 19, 2020 07:08
@freezeboy
Copy link
Contributor Author

@mweinelt You are right, I put it in a wrong branch initially

I updated the version too

jonringer
jonringer reviewed Nov 19, 2020
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.

tests aren't being ran

pkgs/development/python-modules/zha-quirks/default.nix Outdated
nativeBuildInputs = [ pytest ];
buildInputs = [ aiohttp zigpy ];
propagatedBuildInputs = [ aiohttp zigpy ];
checkInputs = [ pytest conftest asynctest ];
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
checkInputs = [ pytest conftest asynctest ];
checkInputs = [ pytestCheckHook conftest asynctest ];

pkgs/development/python-modules/zha-quirks/default.nix Outdated
{ stdenv, buildPythonPackage, fetchPypi
, aiohttp, zigpy
{ lib, buildPythonPackage, fetchPypi
, aiohttp, zigpy, conftest, asynctest
, pytest }:
Copy link
Contributor

Choose a reason for hiding this comment

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

Suggested change
, pytest }:
, pytestCheckHook }:

@freezeboy freezeboy changed the title python3Packages.zha-quirks: unbreak tests python3Packages.zha-quirks: 0.0.45 -> 0.0.46 Nov 19, 2020
@mvnetbiz
Copy link
Contributor

Looks like it also needs pytest-aiohttp pytest-asyncio in checkInputs to get rid of the last warnings.

@mvnetbiz
Copy link
Contributor

https://github.com/zigpy/zha-device-handlers/blob/dev/requirements_test_all.txt
I think the rest of it is plugins for documentation and making prettier reports so it isn't needed

@SuperSandro2000
Copy link
Member

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

2 packages built:
  • python37Packages.zha-quirks
  • python38Packages.zha-quirks

jonringer
jonringer approved these changes Nov 23, 2020
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.

LGTM

https://github.com/NixOS/nixpkgs/pull/104227
2 packages built:
python37Packages.zha-quirks python38Packages.zha-quirks

@jonringer jonringer merged commit a4a1d54 into NixOS:master Nov 23, 2020
@freezeboy freezeboy deleted the unbreak-zha-quirks branch November 23, 2020 15:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jonringer jonringer jonringer approved these changes

@FRidh FRidh Awaiting requested review from FRidh

@etu etu Awaiting requested review from etu

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

Successfully merging this pull request may close these issues.

None yet
5 participants
@freezeboy @mvnetbiz @mweinelt @SuperSandro2000 @jonringer