From f417ed0e69dce879c745a1a79920af01577ee8a3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 May 2021 21:24:30 +0200 Subject: [PATCH 1/3] python3Packages.rich: 9.13.0 -> 10.1.0 --- .../python-modules/rich/default.nix | 22 ++++++++++++------- 1 file changed, 14 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/rich/default.nix b/pkgs/development/python-modules/rich/default.nix index 52bef42f270..d292eaa5223 100644 --- a/pkgs/development/python-modules/rich/default.nix +++ b/pkgs/development/python-modules/rich/default.nix @@ -6,7 +6,7 @@ , colorama , dataclasses , ipywidgets -, poetry +, poetry-core , pygments , typing-extensions , pytestCheckHook @@ -14,27 +14,33 @@ buildPythonPackage rec { pname = "rich"; - version = "9.13.0"; + version = "10.1.0"; + format = "pyproject"; + disabled = pythonOlder "3.6"; - # tests not included in pypi tarball src = fetchFromGitHub { owner = "willmcgugan"; repo = pname; rev = "v${version}"; - sha256 = "0si3rzhg8wfxw4aakkp8sr6nbzfa54rl0w92macd1338q90ha4ly"; + sha256 = "sha256-HH+k9uiK34yoqu83rknCIe2DpoqJRHkcqABuj8zjzqs="; }; - format = "pyproject"; - nativeBuildInputs = [ poetry ]; + nativeBuildInputs = [ poetry-core ]; + propagatedBuildInputs = [ CommonMark colorama ipywidgets pygments typing-extensions - ] ++ lib.optional (pythonOlder "3.7") dataclasses; + ] ++ lib.optional (pythonOlder "3.7") [ + dataclasses + ]; + + checkInputs = [ + pytestCheckHook + ]; - checkInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "rich" ]; meta = with lib; { From 9c6305ab6a48868e6ea872a0c9d7cd37572d1ec2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 5 May 2021 21:25:19 +0200 Subject: [PATCH 2/3] python3Packages.surepy: 0.5.0 -> 0.6.0 --- pkgs/development/python-modules/surepy/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/surepy/default.nix b/pkgs/development/python-modules/surepy/default.nix index dd071b5cf08..ff2b588e470 100644 --- a/pkgs/development/python-modules/surepy/default.nix +++ b/pkgs/development/python-modules/surepy/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "surepy"; - version = "0.5.0"; + version = "0.6.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "benleb"; repo = pname; rev = "v${version}"; - sha256 = "1adsnjya142bxdhfxqsi2qa35ylvdcibigs1wafjlxazlxs3mg0j"; + sha256 = "sha256-XoYiZPBc9SybyKocui1HqSA+YPiPpbupJWMCfmQT5RU="; }; nativeBuildInputs = [ poetry-core ]; @@ -43,11 +43,6 @@ buildPythonPackage rec { rich ]; - postPatch = '' - # halo is out-dated, https://github.com/benleb/surepy/pull/7 - substituteInPlace pyproject.toml --replace "^0.0.30" "^0.0.31" - ''; - # Project has no tests doCheck = false; pythonImportsCheck = [ "surepy" ]; From c742d23e61c00da067fea60841f0607f9d514656 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 7 May 2021 20:01:11 +0200 Subject: [PATCH 3/3] home-assistant: enable surepetcare tests --- pkgs/servers/home-assistant/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index e1f05a38c15..54b74beb6f5 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -358,6 +358,7 @@ in with py.pkgs; buildPythonApplication rec { "stream" "subaru" "sun" + "surepetcare" "switch" "system_health" "system_log"