From 2a4a34fcf9e63a70c96705542a54449da4d288ca Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 29 Mar 2024 10:39:29 +0100 Subject: [PATCH 1/2] python311Packages.python-whois: refactor --- .../python-modules/python-whois/default.nix | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/python-whois/default.nix b/pkgs/development/python-modules/python-whois/default.nix index 6cdfb81628a3..ffaee0af61fa 100644 --- a/pkgs/development/python-modules/python-whois/default.nix +++ b/pkgs/development/python-modules/python-whois/default.nix @@ -4,20 +4,30 @@ , future , nose , pytestCheckHook +, pythonOlder +, setuptools , simplejson }: buildPythonPackage rec { pname = "python-whois"; version = "0.8.0"; - format = "setuptools"; + pyproject = true; + + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; hash = "sha256-3TNtNRfqzip2iUBtt7uWraPF50MnQjFRru4+ZCJfYiA="; }; - propagatedBuildInputs = [ future ]; + build-system = [ + setuptools + ]; + + dependencies = [ + future + ]; nativeCheckInputs = [ nose @@ -31,7 +41,9 @@ buildPythonPackage rec { "test_ipv4" "test_ipv6" ]; - pythonImportsCheck = [ "whois" ]; + pythonImportsCheck = [ + "whois" + ]; meta = with lib; { description = "Python module to produce parsed WHOIS data"; From cba5f4dc6e735e59946f2b8b1cc52c91e64b9d5e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 29 Mar 2024 10:44:54 +0100 Subject: [PATCH 2/2] python312Packages.python-whois: 0.8.0 -> 0.9.3 --- .../python-modules/python-whois/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/python-whois/default.nix b/pkgs/development/python-modules/python-whois/default.nix index ffaee0af61fa..a9bb5cdd8e38 100644 --- a/pkgs/development/python-modules/python-whois/default.nix +++ b/pkgs/development/python-modules/python-whois/default.nix @@ -1,9 +1,9 @@ { lib , buildPythonPackage , fetchPypi -, future -, nose +, pynose , pytestCheckHook +, python-dateutil , pythonOlder , setuptools , simplejson @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "python-whois"; - version = "0.8.0"; + version = "0.9.3"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-3TNtNRfqzip2iUBtt7uWraPF50MnQjFRru4+ZCJfYiA="; + hash = "sha256-jdoscMD4nw+PxIpCNweJMyv/9nm1+kYgSIhBUdJso84="; }; build-system = [ @@ -26,21 +26,25 @@ buildPythonPackage rec { ]; dependencies = [ - future + python-dateutil ]; nativeCheckInputs = [ - nose + pynose pytestCheckHook simplejson ]; - # Exclude tests that require network access disabledTests = [ + # Exclude tests that require network access "test_dk_parse" "test_ipv4" "test_ipv6" + "test_choose_server" + "test_simple_ascii_domain" + "test_simple_unicode_domain" ]; + pythonImportsCheck = [ "whois" ];