From 039873e0f58586e8934648c96a058e96b0ebd6b3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 8 Dec 2022 05:00:44 +0000 Subject: [PATCH 1/3] python310Packages.wurlitzer: 3.0.2 -> 3.0.3 --- pkgs/development/python-modules/wurlitzer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wurlitzer/default.nix b/pkgs/development/python-modules/wurlitzer/default.nix index 395f3ad5b107..19ca73c967ff 100644 --- a/pkgs/development/python-modules/wurlitzer/default.nix +++ b/pkgs/development/python-modules/wurlitzer/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "wurlitzer"; - version = "3.0.2"; + version = "3.0.3"; src = fetchPypi { inherit pname version; - sha256 = "36051ac530ddb461a86b6227c4b09d95f30a1d1043de2b4a592e97ae8a84fcdf"; + sha256 = "sha256-Ik9f5wYYvjhywF393IxFcZHsGHBlRZYnn8we2t6+Pls="; }; propagatedBuildInputs = lib.optionals isPy27 [ selectors2 ]; From d49e9a0e6cc89c07b5314fe6e156a2d90d89cef7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 9 Dec 2022 10:41:11 +0100 Subject: [PATCH 2/3] python310Packages.wurlitzer: add changelog to meta --- pkgs/development/python-modules/wurlitzer/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/wurlitzer/default.nix b/pkgs/development/python-modules/wurlitzer/default.nix index 19ca73c967ff..4c89ec0a7067 100644 --- a/pkgs/development/python-modules/wurlitzer/default.nix +++ b/pkgs/development/python-modules/wurlitzer/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "sha256-Ik9f5wYYvjhywF393IxFcZHsGHBlRZYnn8we2t6+Pls="; + hash = "sha256-Ik9f5wYYvjhywF393IxFcZHsGHBlRZYnn8we2t6+Pls="; }; propagatedBuildInputs = lib.optionals isPy27 [ selectors2 ]; @@ -24,9 +24,11 @@ buildPythonPackage rec { py.test test.py ''; - meta = { + meta = with lib; { description = "Capture C-level output in context managers"; homepage = "https://github.com/minrk/wurlitzer"; - license = lib.licenses.mit; + changelog = "https://github.com/minrk/wurlitzer/blob/{version}/CHANGELOG.md"; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } From 6bca6e20f159933b8955b43cb6c7e27261142a8c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 9 Dec 2022 10:46:03 +0100 Subject: [PATCH 3/3] python310Packages.wurlitzer: switch to pytestCheckHook - add pythonImportsCheck - disable on unsupported Python releases --- .../python-modules/wurlitzer/default.nix | 23 +++++++++++-------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/wurlitzer/default.nix b/pkgs/development/python-modules/wurlitzer/default.nix index 4c89ec0a7067..cf5f514df114 100644 --- a/pkgs/development/python-modules/wurlitzer/default.nix +++ b/pkgs/development/python-modules/wurlitzer/default.nix @@ -1,28 +1,33 @@ { lib , buildPythonPackage , fetchPypi -, isPy27 -, mock -, pytest -, selectors2 +, pythonOlder +, pytestCheckHook }: buildPythonPackage rec { pname = "wurlitzer"; version = "3.0.3"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; hash = "sha256-Ik9f5wYYvjhywF393IxFcZHsGHBlRZYnn8we2t6+Pls="; }; - propagatedBuildInputs = lib.optionals isPy27 [ selectors2 ]; + checkInputs = [ + pytestCheckHook + ]; - checkInputs = [ mock pytest ]; + pythonImportsCheck = [ + "wurlitzer" + ]; - checkPhase = '' - py.test test.py - ''; + pytestFlagsArray = [ + "test.py" + ]; meta = with lib; { description = "Capture C-level output in context managers";