From d646eed968f42c462e5e13518b2d0197f7cef173 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 19 May 2024 23:25:55 +0000 Subject: [PATCH 1/6] python311Packages.ibm-watson: 8.0.0 -> 8.1.0 --- 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 c15ec2005a29..7e04c4b7768a 100644 --- a/pkgs/development/python-modules/ibm-watson/default.nix +++ b/pkgs/development/python-modules/ibm-watson/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "ibm-watson"; - version = "8.0.0"; + version = "8.1.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "watson-developer-cloud"; repo = "python-sdk"; rev = "refs/tags/v${version}"; - hash = "sha256-p2LyR7Fxd0Ny6QCypAWIusnINuhWAhWOnRfZ14FKvro="; + hash = "sha256-r7A5i17KIy1pBrj01yeknfrOFjb5yZco8ZOc7tlFM7k="; }; propagatedBuildInputs = [ From b4c5d536b69730cb35e3b7186fb328a7213c7a93 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 20 May 2024 08:59:39 +0200 Subject: [PATCH 2/6] python311Packages.ibm-watson: refactor --- pkgs/development/python-modules/ibm-watson/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ibm-watson/default.nix b/pkgs/development/python-modules/ibm-watson/default.nix index 7e04c4b7768a..238772361884 100644 --- a/pkgs/development/python-modules/ibm-watson/default.nix +++ b/pkgs/development/python-modules/ibm-watson/default.nix @@ -8,6 +8,7 @@ , python-dotenv , pythonOlder , requests +, setuptools , responses , websocket-client }: @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "ibm-watson"; version = "8.1.0"; - format = "setuptools"; + pyproject = true; disabled = pythonOlder "3.7"; @@ -26,7 +27,11 @@ buildPythonPackage rec { hash = "sha256-r7A5i17KIy1pBrj01yeknfrOFjb5yZco8ZOc7tlFM7k="; }; - propagatedBuildInputs = [ + build-system = [ + setuptools + ]; + + dependencies = [ ibm-cloud-sdk-core python-dateutil requests From 708d255c12e208260c9c2254402cb775f24ba61d Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 20 May 2024 08:59:55 +0200 Subject: [PATCH 3/6] python311Packages.ibm-watson: format with nixfmt --- .../python-modules/ibm-watson/default.nix | 35 +++++++++---------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/ibm-watson/default.nix b/pkgs/development/python-modules/ibm-watson/default.nix index 238772361884..74ce5e988452 100644 --- a/pkgs/development/python-modules/ibm-watson/default.nix +++ b/pkgs/development/python-modules/ibm-watson/default.nix @@ -1,16 +1,17 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, ibm-cloud-sdk-core -, pytest-rerunfailures -, pytestCheckHook -, python-dateutil -, python-dotenv -, pythonOlder -, requests -, setuptools -, responses -, websocket-client +{ + lib, + buildPythonPackage, + fetchFromGitHub, + ibm-cloud-sdk-core, + pytest-rerunfailures, + pytestCheckHook, + python-dateutil, + python-dotenv, + pythonOlder, + requests, + setuptools, + responses, + websocket-client, }: buildPythonPackage rec { @@ -27,9 +28,7 @@ buildPythonPackage rec { hash = "sha256-r7A5i17KIy1pBrj01yeknfrOFjb5yZco8ZOc7tlFM7k="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ ibm-cloud-sdk-core @@ -45,9 +44,7 @@ buildPythonPackage rec { responses ]; - pythonImportsCheck = [ - "ibm_watson" - ]; + pythonImportsCheck = [ "ibm_watson" ]; meta = with lib; { description = "Client library to use the IBM Watson Services"; From c859927990d2cfcca82ec56dd5a17fa16753b40b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 20 May 2024 09:05:54 +0200 Subject: [PATCH 4/6] python311Packages.ibm-cloud-sdk-core: refactor --- .../development/python-modules/ibm-cloud-sdk-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index 65ddf3d5c071..dfdc089326c2 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -22,11 +22,11 @@ buildPythonPackage rec { hash = "sha256-CqbZcEP1ianvRRpx527KBjQTjvGBzlSmoKY1Pe5MXRA="; }; - nativeBuildInputs = [ + build-system = [ setuptools ]; - propagatedBuildInputs = [ + dependencies = [ pyjwt python-dateutil requests From 9929a6bb3bde653edfff0964d673b93191a14c3f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 20 May 2024 09:07:56 +0200 Subject: [PATCH 5/6] python311Packages.ibm-cloud-sdk-core: format with nixfmt --- .../ibm-cloud-sdk-core/default.nix | 25 +++++++++---------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index dfdc089326c2..aa544ecbc39b 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -1,13 +1,14 @@ -{ lib -, buildPythonPackage -, fetchPypi -, pyjwt -, pytestCheckHook -, python-dateutil -, pythonOlder -, requests -, responses -, setuptools +{ + lib, + buildPythonPackage, + fetchPypi, + pyjwt, + pytestCheckHook, + python-dateutil, + pythonOlder, + requests, + responses, + setuptools, }: buildPythonPackage rec { @@ -22,9 +23,7 @@ buildPythonPackage rec { hash = "sha256-CqbZcEP1ianvRRpx527KBjQTjvGBzlSmoKY1Pe5MXRA="; }; - build-system = [ - setuptools - ]; + build-system = [ setuptools ]; dependencies = [ pyjwt From 5f3ffd31a74a8e2b2745eb0a6dd69be85f559e4f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Mon, 20 May 2024 09:08:56 +0200 Subject: [PATCH 6/6] python312Packages.ibm-cloud-sdk-core: disable failing test on Python 3.12 --- .../python-modules/ibm-cloud-sdk-core/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix index aa544ecbc39b..277836600a5d 100644 --- a/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix +++ b/pkgs/development/python-modules/ibm-cloud-sdk-core/default.nix @@ -5,6 +5,7 @@ pyjwt, pytestCheckHook, python-dateutil, + pythonAtLeast, pythonOlder, requests, responses, @@ -51,6 +52,10 @@ buildPythonPackage rec { "test_retry_config_external" # assertion error due to requests brotli support "test_http_client" + ] ++ lib.optionals (pythonAtLeast "3.12") [ + # Tests are blocking or failing + "test_abstract_class_instantiation" + "test_abstract_class_instantiation" ]; disabledTestPaths = [