From b3bf4ccae1785faa7757054b3720704cc6639c94 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 18 Aug 2021 18:27:37 +0200 Subject: [PATCH 1/2] python3Packages.softlayer: 5.8.4 -> 5.9.7 --- pkgs/development/python-modules/softlayer/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/softlayer/default.nix b/pkgs/development/python-modules/softlayer/default.nix index f0ec10fafb94..cdac300c573b 100644 --- a/pkgs/development/python-modules/softlayer/default.nix +++ b/pkgs/development/python-modules/softlayer/default.nix @@ -13,16 +13,17 @@ , mock , sphinx , testtools +, tkinter }: buildPythonPackage rec { - pname = "softlayer-python"; - version = "5.8.4"; + pname = "softlayer"; + version = "5.9.7"; disabled = isPy27; propagatedBuildInputs = [ ptable click requests prompt-toolkit pygments urllib3 ]; - checkInputs = [ pytest pytest-cov mock sphinx testtools ]; + checkInputs = [ pytest pytest-cov mock sphinx testtools tkinter ]; checkPhase = '' pytest @@ -32,7 +33,7 @@ buildPythonPackage rec { owner = "softlayer"; repo = pname; rev = "v${version}"; - sha256 = "10kzi7kvvifr21a46q2xqsibs0bx5ys22nfym0bg605ka37vcz88"; + sha256 = "sha256-72ZKc8WlVPs7HISHaAcZKM+ZLbiPbsOJpaNPdvP0kH8="; }; meta = with lib; { From 15d4912e50e27f2f01bcad7d5e90eb73901a640f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 18 Aug 2021 18:50:44 +0200 Subject: [PATCH 2/2] python3Packages.softlayer: cleanup --- .../python-modules/softlayer/default.nix | 55 +++++++++++-------- 1 file changed, 33 insertions(+), 22 deletions(-) diff --git a/pkgs/development/python-modules/softlayer/default.nix b/pkgs/development/python-modules/softlayer/default.nix index cdac300c573b..ef0bb8a07170 100644 --- a/pkgs/development/python-modules/softlayer/default.nix +++ b/pkgs/development/python-modules/softlayer/default.nix @@ -1,44 +1,55 @@ { lib , buildPythonPackage -, fetchFromGitHub -, isPy27 -, ptable , click -, requests -, prompt-toolkit -, pygments -, urllib3 -, pytest -, pytest-cov +, fetchFromGitHub , mock +, prompt-toolkit +, ptable +, pygments +, pytestCheckHook +, pythonOlder +, requests , sphinx , testtools , tkinter +, urllib3 }: buildPythonPackage rec { pname = "softlayer"; version = "5.9.7"; - disabled = isPy27; - - propagatedBuildInputs = [ ptable click requests prompt-toolkit pygments urllib3 ]; - - checkInputs = [ pytest pytest-cov mock sphinx testtools tkinter ]; - - checkPhase = '' - pytest - ''; + disabled = pythonOlder "3.5"; src = fetchFromGitHub { - owner = "softlayer"; - repo = pname; + owner = pname; + repo = "softlayer-python"; rev = "v${version}"; - sha256 = "sha256-72ZKc8WlVPs7HISHaAcZKM+ZLbiPbsOJpaNPdvP0kH8="; + sha256 = "0zwhykrpckx3ln4w6vlgp0nrkkr8343ni1w43hxznm55qmrllrpg"; }; + propagatedBuildInputs = [ + click + prompt-toolkit + ptable + pygments + requests + urllib3 + ]; + + checkInputs = [ + mock + pytestCheckHook + sphinx + testtools + tkinter + ]; + + pythonImportsCheck = [ "SoftLayer" ]; + meta = with lib; { - description = "A set of Python libraries that assist in calling the SoftLayer API."; + description = "Python libraries that assist in calling the SoftLayer API"; homepage = "https://github.com/softlayer/softlayer-python"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; }