From b3309be9349f9bb87b9e39b978a12083fefe79f9 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 27 Jan 2022 05:45:29 +0000 Subject: [PATCH 1/2] python310Packages.ibm-watson: 5.3.0 -> 5.3.1 --- pkgs/development/python-modules/ibm-watson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ibm-watson/default.nix b/pkgs/development/python-modules/ibm-watson/default.nix index a0c12758069b..95e492d78a76 100644 --- a/pkgs/development/python-modules/ibm-watson/default.nix +++ b/pkgs/development/python-modules/ibm-watson/default.nix @@ -14,13 +14,13 @@ buildPythonPackage rec { pname = "ibm-watson"; - version = "5.3.0"; + version = "5.3.1"; src = fetchFromGitHub { owner = "watson-developer-cloud"; repo = "python-sdk"; rev = "v${version}"; - sha256 = "0g63h7rf0710bxcsr115857bvz69sl2g5d13k5a7qi7hjh33bxrk"; + sha256 = "1x6r8j0xyi81jb0q4pzr6l7aglykrwqz8nw45clv79v33i2sgdcs"; }; checkInputs = [ From d746a9c2d8498750ffb84067f6e3fe75bfa3b3dd Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 27 Jan 2022 09:30:14 +0100 Subject: [PATCH 2/2] python3Packages.ibm-watson: add pythonImportsCheck --- .../python-modules/ibm-watson/default.nix | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/ibm-watson/default.nix b/pkgs/development/python-modules/ibm-watson/default.nix index 95e492d78a76..e8ecdfff32ba 100644 --- a/pkgs/development/python-modules/ibm-watson/default.nix +++ b/pkgs/development/python-modules/ibm-watson/default.nix @@ -10,11 +10,15 @@ , python-dateutil , websocket-client , ibm-cloud-sdk-core +, pythonOlder }: buildPythonPackage rec { pname = "ibm-watson"; version = "5.3.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "watson-developer-cloud"; @@ -23,6 +27,13 @@ buildPythonPackage rec { sha256 = "1x6r8j0xyi81jb0q4pzr6l7aglykrwqz8nw45clv79v33i2sgdcs"; }; + propagatedBuildInputs = [ + requests + python-dateutil + websocket-client + ibm-cloud-sdk-core + ]; + checkInputs = [ responses pytestCheckHook @@ -31,18 +42,15 @@ buildPythonPackage rec { tox ]; - propagatedBuildInputs = [ - requests - python-dateutil - websocket-client - ibm-cloud-sdk-core - ]; - postPatch = '' substituteInPlace setup.py \ --replace websocket-client==1.1.0 websocket-client>=1.1.0 ''; + pythonImportsCheck = [ + "ibm_watson" + ]; + meta = with lib; { description = "Client library to use the IBM Watson Services"; homepage = "https://github.com/watson-developer-cloud/python-sdk";